piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Fix glslang on Windows

Browse Source
This commit is contained in:
Florent Castelli 2017-01-20 17:50:44 +01:00
parent b670f434b2
commit 9e451d601c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Externals/glslang/CMakeLists.txt vendored
View File

@ -27,7 +27,7 @@ set(SRCS
glslang/MachineIndependent/ShaderLang.cpp glslang/MachineIndependent/ShaderLang.cpp
glslang/MachineIndependent/SymbolTable.cpp glslang/MachineIndependent/SymbolTable.cpp
glslang/MachineIndependent/Versions.cpp glslang/MachineIndependent/Versions.cpp
glslang/OSDependent/Unix/ossource.cpp
hlsl/hlslGrammar.cpp hlsl/hlslGrammar.cpp
hlsl/hlslOpMap.cpp hlsl/hlslOpMap.cpp
hlsl/hlslParseables.cpp hlsl/hlslParseables.cpp
@ -44,6 +44,13 @@ set(SRCS
SPIRV/SPVRemapper.cpp SPIRV/SPVRemapper.cpp
) )
if(WIN32)
list(APPEND SRCS glslang/OSDependent/Windows/ossource.cpp)
else()
list(APPEND SRCS glslang/OSDependent/Unix/ossource.cpp)
endif()
if(NOT MSVC)
# glslang requires C++11 at a minimum to compile. # glslang requires C++11 at a minimum to compile.
add_definitions(-std=c++11) add_definitions(-std=c++11)
@ -53,6 +60,6 @@ add_definitions(-Wno-reorder)
add_definitions(-Wno-sign-compare) add_definitions(-Wno-sign-compare)
add_definitions(-Wno-parentheses) add_definitions(-Wno-parentheses)
add_definitions(-Wno-unused-variable) add_definitions(-Wno-unused-variable)
endif()
add_library(glslang STATIC ${SRCS}) add_library(glslang STATIC ${SRCS})