mirror of
https://github.com/bjornbytes/lovr.git
synced 2024-07-04 21:43:34 +00:00
Update glslang;
This commit is contained in:
parent
56851fd0f2
commit
edb65a7578
|
@ -184,14 +184,9 @@ if(LOVR_USE_GLSLANG)
|
||||||
set(ENABLE_CTEST OFF CACHE BOOL "")
|
set(ENABLE_CTEST OFF CACHE BOOL "")
|
||||||
set(BUILD_EXTERNAL OFF CACHE BOOL "")
|
set(BUILD_EXTERNAL OFF CACHE BOOL "")
|
||||||
set(BUILD_SHARED_LIBS OFF)
|
set(BUILD_SHARED_LIBS OFF)
|
||||||
include_directories(deps/glslang/glslang/Include deps/glslang/StandAlone)
|
include_directories(deps/glslang/glslang/Include deps/glslang/glslang/Public)
|
||||||
add_subdirectory(deps/glslang glslang)
|
add_subdirectory(deps/glslang glslang)
|
||||||
add_library(lovr_glslang
|
set(LOVR_GLSLANG glslang SPIRV glslang-default-resource-limits)
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/deps/glslang/StandAlone/ResourceLimits.cpp"
|
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/deps/glslang/StandAlone/resource_limits_c.cpp"
|
|
||||||
)
|
|
||||||
target_link_libraries(lovr_glslang PUBLIC glslang)
|
|
||||||
set(LOVR_GLSLANG lovr_glslang SPIRV)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Vulkan
|
# Vulkan
|
||||||
|
|
|
@ -247,7 +247,7 @@ end
|
||||||
|
|
||||||
if config.modules.graphics and config.glslang then
|
if config.modules.graphics and config.glslang then
|
||||||
cflags_graphics += '-Ideps/glslang/glslang/Include'
|
cflags_graphics += '-Ideps/glslang/glslang/Include'
|
||||||
cflags_graphics += '-Ideps/glslang/StandAlone'
|
cflags_graphics += '-Ideps/glslang/glslang/Public'
|
||||||
cflags += '-DLOVR_USE_GLSLANG'
|
cflags += '-DLOVR_USE_GLSLANG'
|
||||||
lflags += '-lglslang'
|
lflags += '-lglslang'
|
||||||
|
|
||||||
|
@ -270,8 +270,8 @@ if config.modules.graphics and config.glslang then
|
||||||
glslang_src += 'deps/glslang/SPIRV/SpvPostProcess.cpp'
|
glslang_src += 'deps/glslang/SPIRV/SpvPostProcess.cpp'
|
||||||
glslang_src += 'deps/glslang/SPIRV/InReadableOrder.cpp'
|
glslang_src += 'deps/glslang/SPIRV/InReadableOrder.cpp'
|
||||||
glslang_src += 'deps/glslang/SPIRV/CInterface/spirv_c_interface.cpp'
|
glslang_src += 'deps/glslang/SPIRV/CInterface/spirv_c_interface.cpp'
|
||||||
glslang_src += 'deps/glslang/StandAlone/resource_limits_c.cpp'
|
glslang_src += 'deps/glslang/glslang/ResourceLimits/resource_limits_c.cpp'
|
||||||
glslang_src += 'deps/glslang/StandAlone/ResourceLimits.cpp'
|
glslang_src += 'deps/glslang/glslang/ResourceLimits/ResourceLimits.cpp'
|
||||||
|
|
||||||
tup.foreach_rule(glslang_src, '^ CC glslang/%b^ $(cc) $(flags) $(glslang_cflags) -c %f -o %o', '.obj/glslang/%B.o')
|
tup.foreach_rule(glslang_src, '^ CC glslang/%b^ $(cc) $(flags) $(glslang_cflags) -c %f -o %o', '.obj/glslang/%B.o')
|
||||||
tup.rule('.obj/glslang/*.o', '^ LD %o^ $(cxx) $(flags) -o %o %f $(glslang_lflags)', lib('glslang'))
|
tup.rule('.obj/glslang/*.o', '^ LD %o^ $(cxx) $(flags) -o %o %f $(glslang_lflags)', lib('glslang'))
|
||||||
|
|
2
deps/glslang
vendored
2
deps/glslang
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit de4daf201a2acd83ad523b4c6148e4d8e5b7dab4
|
Subproject commit cdafe1c6028e01d669a02576b291e111b5e08d78
|
Loading…
Reference in a new issue