piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 09:59:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Externals: Fix build failures with the newer glslang.

Browse Source 
v2: Don't include glslang project wide.
This commit is contained in:
orbea
2020-03-02 07:56:41 -08:00
parent 690dee3533
commit ba2d04b793
6 changed files with 25 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Externals/glslang/CMakeLists.txt vendored
View File

@ -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
)

6
Externals/glslang/glslang.vcxproj vendored
View File

@ -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>
</Project>

12
Externals/glslang/glslang.vcxproj.filters vendored
View File

@ -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>