Skip to content

Commit 6f092a0

Browse files
committed
update build system, make Nabla build with fully updated glslang & shaderc
1 parent 8afc5db commit 6f092a0

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

3rdparty/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,6 @@ target_include_directories(SPIRV PUBLIC "${GLSLANG_GENERATED_INCLUDEDIR}")
161161
set(SHADERC_SKIP_TESTS ON CACHE INTERNAL "Skip shaderc tests?")
162162
set(SHADERC_SKIP_INSTALL ON CACHE INTERNAL "Install shaderc?")
163163

164-
# if it doesn't work without the `touch` on Linux, then fetch the latest submodule head of shaderc and try again
165-
# https://github.com/google/shaderc/issues/568
166-
if (UNIX)
167-
file(WRITE ${THIRD_PARTY_SOURCE_DIR}/shaderc/libshaderc/libshaderc_combined.a "")
168-
endif()
169164
add_subdirectory(shaderc shaderc EXCLUDE_FROM_ALL)
170165

171166
# libjpeg-turbo
@@ -468,7 +463,6 @@ set(NBL_3RDPARTY_TARGETS
468463
simdjson
469464
nlohmann_json
470465
glslang
471-
OGLCompiler
472466
OSDependent
473467
MachineIndependent
474468
GenericCodeGen
@@ -494,9 +488,6 @@ endif()
494488
if (NBL_BUILD_IMGUI)
495489
list(APPEND NBL_3RDPARTY_TARGETS imgui implot imtestsuite imtestengine imguizmo)
496490
endif()
497-
if(ENABLE_HLSL)
498-
list(APPEND NBL_3RDPARTY_TARGETS HLSL)
499-
endif()
500491

501492
foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
502493
if(NBL_DYNAMIC_MSVC_RUNTIME)

src/nbl/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,6 @@ if(NBL_STATIC_BUILD)
714714
nbl_install_lib(glslang)
715715
nbl_install_lib(GenericCodeGen)
716716
nbl_install_lib(MachineIndependent)
717-
nbl_install_lib(HLSL)
718717
nbl_install_lib(jpeg-static)
719718
if (_NBL_COMPILE_WITH_OPEN_EXR_)
720719
nbl_install_lib(OpenEXR)
@@ -728,7 +727,6 @@ if(NBL_STATIC_BUILD)
728727
nbl_install_lib(SPIRV)
729728
nbl_install_lib(SPIRV-Tools-static) # TODO: make this function/macro work with alias target
730729
nbl_install_lib(SPIRV-Tools-opt)
731-
nbl_install_lib(OGLCompiler)
732730
nbl_install_lib(OSDependent)
733731
nbl_install_lib(zlibstatic)
734732
nbl_install_lib(simdjson)

0 commit comments

Comments
 (0)