Externals: Fix build failures with the newer glslang.

v2: Don't include glslang project wide.

3 files changed, 20 insertions, 5 deletions

diff --git a/Externals/glslang/CMakeLists.txt b/Externals/glslang/CMakeLists.txt
index e531534a96..7a4ab7cba0 100644
--- a/Externals/glslang/CMakeLists.txt
+++ b/Externals/glslang/CMakeLists.txt
@@ -35,7 +35,9 @@ set(SRCS
 	SPIRV/InReadableOrder.cpp
 	SPIRV/Logger.cpp
 	SPIRV/SpvBuilder.cpp
+	SPIRV/SpvPostProcess.cpp
 	SPIRV/SPVRemapper.cpp
+	StandAlone/ResourceLimits.cpp
 )
 
 if(WIN32)
@@ -62,3 +64,8 @@ endif()
 endif()
 
 add_library(glslang STATIC ${SRCS})
+
+target_include_directories(glslang
+PRIVATE
+	${CMAKE_SOURCE_DIR}/Externals/glslang
+)
diff --git a/Externals/glslang/glslang.vcxproj b/Externals/glslang/glslang.vcxproj
index 8db1bd2b9f..6e0b810a0a 100644
--- a/Externals/glslang/glslang.vcxproj
+++ b/Externals/glslang/glslang.vcxproj
@@ -81,7 +81,9 @@
     <ClCompile Include="SPIRV\InReadableOrder.cpp" />

     <ClCompile Include="SPIRV\Logger.cpp" />

     <ClCompile Include="SPIRV\SpvBuilder.cpp" />

+    <ClCompile Include="SPIRV\SpvPostProcess.cpp" />

     <ClCompile Include="SPIRV\SPVRemapper.cpp" />

+    <ClCompile Include="StandAlone\ResourceLimits.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="glslang\Include\arrays.h" />

@@ -92,7 +94,6 @@
     <ClInclude Include="glslang\Include\InitializeGlobals.h" />

     <ClInclude Include="glslang\Include\intermediate.h" />

     <ClInclude Include="glslang\Include\PoolAlloc.h" />

-    <ClInclude Include="glslang\Include\ResourceLimits.h" />

     <ClInclude Include="glslang\Include\revision.h" />

     <ClInclude Include="glslang\Include\ShHandle.h" />

     <ClInclude Include="glslang\Include\Types.h" />

@@ -126,6 +127,7 @@
     <ClInclude Include="SPIRV\SpvBuilder.h" />

     <ClInclude Include="SPIRV\spvIR.h" />

     <ClInclude Include="SPIRV\SPVRemapper.h" />

+    <ClInclude Include="StandAlone\ResourceLimits.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="glslang\MachineIndependent\glslang.y" />

@@ -133,4 +135,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/Externals/glslang/glslang.vcxproj.filters b/Externals/glslang/glslang.vcxproj.filters
index 65acdecdcd..c92a56ed25 100644
--- a/Externals/glslang/glslang.vcxproj.filters
+++ b/Externals/glslang/glslang.vcxproj.filters
@@ -103,9 +103,15 @@
     <ClCompile Include="SPIRV\SpvBuilder.cpp">

       <Filter>SPIRV</Filter>

     </ClCompile>

+    <ClCompile Include="SPIRV\SpvPostProcess.cpp">

+      <Filter>SPIRV</Filter>

+    </ClCompile>

     <ClCompile Include="SPIRV\SPVRemapper.cpp">

       <Filter>SPIRV</Filter>

     </ClCompile>

+    <ClCompile Include="StandAlone\ResourceLimits.cpp">

+      <Filter>StandAlone</Filter>

+    </ClCompile>

     <ClCompile Include="OGLCompilersDLL\InitializeDll.cpp">

       <Filter>OGLCompilersDLL</Filter>

     </ClCompile>

@@ -117,8 +123,8 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="glslang\Include\ResourceLimits.h">

-      <Filter>glslang\Include</Filter>

+    <ClInclude Include="StandAlone\ResourceLimits.h">

+      <Filter>StandAlone</Filter>

     </ClInclude>

     <ClInclude Include="glslang\Include\revision.h">

       <Filter>glslang\Include</Filter>

@@ -281,4 +287,4 @@
       <Filter>glslang\MachineIndependant</Filter>

     </None>

   </ItemGroup>

-</Project>
+</Project>