diff --git a/.gitignore b/.gitignore index 20939ad..943d8cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -build/ +[Bb]uild/ *.swp CMakeCache.txt CMakeFiles/ diff --git a/bgfx b/bgfx index 4748766..5e4646f 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 4748766009e1bd6f3d302aa86539afb4f0f4ed13 +Subproject commit 5e4646fbbc0184800a3493cdf10f7eed22757813 diff --git a/bimg b/bimg index f89b12a..b34b29f 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit f89b12ae25e4d3734549fe6da19c75ed63789742 +Subproject commit b34b29fa694d5bd328bd374c1728b4d0426b1788 diff --git a/bx b/bx index 62daee4..2e4bc10 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 62daee4ffa666dcd82f086fa5fd63644574ca9dd +Subproject commit 2e4bc10d6c63b811f4aa2f9c8678339221bc73ca diff --git a/cmake/tools/shaderc.cmake b/cmake/tools/shaderc.cmake index 29deec8..319bb49 100644 --- a/cmake/tools/shaderc.cmake +++ b/cmake/tools/shaderc.cmake @@ -16,10 +16,11 @@ include( cmake/3rdparty/glslang.cmake ) include( cmake/3rdparty/spirv-cross.cmake ) include( cmake/3rdparty/spirv-tools.cmake ) -add_executable( shaderc ${BGFX_DIR}/tools/shaderc/shaderc.cpp ${BGFX_DIR}/tools/shaderc/shaderc.h ${BGFX_DIR}/tools/shaderc/shaderc_glsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_hlsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_pssl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_spirv.cpp ) +add_executable( shaderc ${BGFX_DIR}/tools/shaderc/shaderc.cpp ${BGFX_DIR}/tools/shaderc/shaderc.h ${BGFX_DIR}/tools/shaderc/shaderc_glsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_hlsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_pssl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_spirv.cpp ${BGFX_DIR}/tools/shaderc/shaderc_metal.cpp ) target_compile_definitions( shaderc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" ) set_target_properties( shaderc PROPERTIES FOLDER "bgfx/tools" ) target_link_libraries( shaderc bx bimg bgfx-vertexdecl bgfx-shader-spirv fcpp glsl-optimizer glslang spirv-cross spirv-tools ) + if( BGFX_CUSTOM_TARGETS ) add_dependencies( tools shaderc ) endif()