Update build files

knot-alot · Apr 29, 2021 · b856a1b · b856a1b
1 parent 871d052
commit b856a1b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/cmake/3rdparty/glslang.cmake b/cmake/3rdparty/glslang.cmake
@@ -15,7 +15,7 @@ endif()
 file( GLOB GLSLANG_SOURCES
 	${BGFX_DIR}/3rdparty/glslang/glslang/GenericCodeGen/*.cpp
 	${BGFX_DIR}/3rdparty/glslang/glslang/MachineIndependent/*.cpp
-	${BGFX_DIR}/3rdparty/glslang/glslang/MachineIndependent/preprocessor/*.cpp
+	${BGFX_DIR}/3rdparty/glslang/glslang/MachineIndependent/preprocessor/*.cpp
 	${BGFX_DIR}/3rdparty/glslang/glslang/HLSL/*.cpp
 	${BGFX_DIR}/3rdparty/glslang/hlsl/*.cpp
 	${BGFX_DIR}/3rdparty/glslang/SPIRV/*.cpp
@@ -35,6 +35,9 @@ target_include_directories( glslang PUBLIC
 	${BGFX_DIR}/3rdparty/glslang
 	${BGFX_DIR}/3rdparty/glslang/glslang/Include
 	${BGFX_DIR}/3rdparty/glslang/glslang/Public
+
+	PRIVATE
+	${BGFX_DIR}/3rdparty
 )
 
 set_target_properties( glslang PROPERTIES FOLDER "bgfx/3rdparty" )
@@ -92,4 +95,4 @@ endif()
 target_compile_definitions( glslang PRIVATE
 	ENABLE_OPT=1
 	ENABLE_HLSL=1
-)
+)
diff --git a/cmake/examples.cmake b/cmake/examples.cmake
@@ -268,7 +268,12 @@ if( BGFX_BUILD_EXAMPLES )
 #		37-gpudrivenrendering
 		38-bloom
 		39-assao
-#		40-svt
+		40-svt
+#		41-tess
+		42-bunnylod
+		43-denoise
+		44-sss
+		45-bokeh
 	)
 
 	foreach( EXAMPLE ${BGFX_EXAMPLES} )

diff --git a/cmake/shared.cmake b/cmake/shared.cmake
@@ -14,11 +14,12 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/vertexlayout.cpp.in
 target_sources( bgfx-vertexlayout INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/vertexlayout.cpp )
 target_include_directories( bgfx-vertexlayout INTERFACE ${BGFX_DIR}/include )
 
-add_library( bgfx-shader-spirv INTERFACE )
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/shader_spirv.cpp.in
-                ${CMAKE_CURRENT_BINARY_DIR}/generated/shader_spirv.cpp )
-target_sources( bgfx-shader-spirv INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/shader_spirv.cpp )
-target_include_directories( bgfx-shader-spirv INTERFACE ${BGFX_DIR}/include )
+add_library( bgfx-shader INTERFACE )
+
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/shader.cpp.in
+                ${CMAKE_CURRENT_BINARY_DIR}/generated/shader.cpp )
+target_sources( bgfx-shader INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/shader.cpp )
+target_include_directories( bgfx-shader INTERFACE ${BGFX_DIR}/include )
 
 add_library( bgfx-bounds INTERFACE )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/bounds.cpp.in

diff --git a/cmake/tools/shaderc.cmake b/cmake/tools/shaderc.cmake
@@ -20,7 +20,7 @@ include( cmake/3rdparty/webgpu.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 ${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 PRIVATE bx bimg bgfx-vertexlayout bgfx-shader-spirv fcpp glsl-optimizer glslang spirv-cross spirv-tools webgpu)
+target_link_libraries(shaderc PRIVATE bx bimg bgfx-vertexlayout bgfx-shader fcpp glsl-optimizer glslang spirv-cross spirv-tools webgpu)
 
 if( BGFX_CUSTOM_TARGETS )
 	add_dependencies( tools shaderc )

diff --git a/generated/shader.cpp.in b/generated/shader.cpp.in
@@ -0,0 +1,4 @@
+#include "@BGFX_DIR@/src/shader.cpp"
+#include "@BGFX_DIR@/src/shader_dx9bc.cpp"
+#include "@BGFX_DIR@/src/shader_dxbc.cpp"
+#include "@BGFX_DIR@/src/shader_spirv.cpp"
diff --git a/generated/shader_spirv.cpp.in b/generated/shader_spirv.cpp.in