diff --git a/CMakeLists.txt b/CMakeLists.txt index 04d3c2e..90768c0 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,14 +101,6 @@ if(NEEDS_HOSTED_SHADER_COMPILER AND (NOT DEFINED SHADER_COMPILER_LOCATION)) message(FATAL_ERROR "You are building for a platform that needs a hosted shader compiler. Please specify the path in SHADER_COMPILER_LOCATION!") endif() -set(CROSS_LIBS - spirv-cross-core - spirv-cross-glsl - spirv-cross-msl - glslang - SPIRV -) - add_subdirectory(extern) # enable lto @@ -120,8 +112,6 @@ add_subdirectory(platforms) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -source_group(Shaders shaders) - add_subdirectory(engine) add_subdirectory(tools) add_subdirectory(example) \ No newline at end of file diff --git a/engine/shadercompiler/CMakeLists.txt b/engine/shadercompiler/CMakeLists.txt index 4f77f6e..39dffdf 100755 --- a/engine/shadercompiler/CMakeLists.txt +++ b/engine/shadercompiler/CMakeLists.txt @@ -12,6 +12,10 @@ target_link_libraries(ShaderCompiler PRIVATE Utility Log - ${CROSS_LIBS}) + spirv-cross-core + spirv-cross-glsl + spirv-cross-msl + glslang + SPIRV) target_include_directories(ShaderCompiler PUBLIC include PRIVATE src) set_engine_properties(ShaderCompiler)