summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoCommon')
-rw-r--r--Source/Core/VideoCommon/CMakeLists.txt12
-rw-r--r--Source/Core/VideoCommon/Spirv.cpp5
-rw-r--r--Source/Core/VideoCommon/Spirv.h2
3 files changed, 4 insertions, 15 deletions
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 0ead1af2f8..ae9aafbbba 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -224,7 +224,7 @@ PRIVATE
xxhash::xxhash
imgui
implot
- glslang
+ glslang::glslang
tinygltf
)
@@ -267,16 +267,6 @@ if(FFmpeg_FOUND)
endif()
endif()
-# Silence warnings on glslang by flagging it as a system include
-target_include_directories(videocommon
-SYSTEM PUBLIC
- ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/glslang/Public
-SYSTEM PRIVATE
- ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/glslang
- ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/SPIRV
- ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang
-)
-
if(MSVC)
# Add precompiled header
target_link_libraries(videocommon PRIVATE use_pch)
diff --git a/Source/Core/VideoCommon/Spirv.cpp b/Source/Core/VideoCommon/Spirv.cpp
index 1ee3d6da2d..59bc872f93 100644
--- a/Source/Core/VideoCommon/Spirv.cpp
+++ b/Source/Core/VideoCommon/Spirv.cpp
@@ -3,9 +3,8 @@
#include "VideoCommon/Spirv.h"
-// glslang includes
-#include "GlslangToSpv.h"
-#include "disassemble.h"
+#include <glslang/SPIRV/GlslangToSpv.h>
+#include <glslang/SPIRV/disassemble.h>
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
diff --git a/Source/Core/VideoCommon/Spirv.h b/Source/Core/VideoCommon/Spirv.h
index fe75ea0f99..4da7b01c17 100644
--- a/Source/Core/VideoCommon/Spirv.h
+++ b/Source/Core/VideoCommon/Spirv.h
@@ -8,7 +8,7 @@
#include <string_view>
#include <vector>
-#include "ShaderLang.h"
+#include <glslang/Public/ShaderLang.h>
#include "Common/CommonTypes.h"
#include "VideoCommon/VideoCommon.h"