Make sure mm files aren't globbed on non-apple computers

Add missing validate_graph.cpp to fix dependabot builds
build(deps): bump the submodules group with 2 updates
2026-02-17 21:12:35 +01:00 · 2025-10-29 21:44:41 -04:00 · 2025-10-22 17:49:15 -04:00 · 2025-10-22 17:49:15 -04:00 · 2025-09-10 14:45:34 -04:00 · 2025-08-03 19:21:05 -04:00
5 changed files with 15 additions and 12 deletions
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/cmake/bgfx/3rdparty/spirv-opt.cmake
+++ b/cmake/bgfx/3rdparty/spirv-opt.cmake
@@ -112,6 +112,7 @@ file(
 	${SPIRV_TOOLS}/source/val/validate_execution_limitations.cpp
 	${SPIRV_TOOLS}/source/val/validate_extensions.cpp
 	${SPIRV_TOOLS}/source/val/validate_function.cpp
+	${SPIRV_TOOLS}/source/val/validate_graph.cpp
 	${SPIRV_TOOLS}/source/val/validate_id.cpp
 	${SPIRV_TOOLS}/source/val/validate_image.cpp
 	${SPIRV_TOOLS}/source/val/validate_instruction.cpp
--- a/cmake/bgfx/bgfx.cmake
+++ b/cmake/bgfx/bgfx.cmake
@@ -19,22 +19,25 @@ if(NOT IS_DIRECTORY ${BGFX_DIR})
 	return()
 endif()

-if(NOT APPLE)
-	set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp)
-else()
-	set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.mm)
-endif()
-
 # Grab the bgfx source files
 file(
 	GLOB
 	BGFX_SOURCES
 	${BGFX_DIR}/src/*.cpp
-	${BGFX_DIR}/src/*.mm
 	${BGFX_DIR}/src/*.h
 	${BGFX_DIR}/include/bgfx/*.h
 	${BGFX_DIR}/include/bgfx/c99/*.h
 )
+
+if(APPLE)
+	file(GLOB BGFX_OBJC_SOURCES ${BGFX_DIR}/src/*.mm)
+	list(APPEND BGFX_SOURCES ${BGFX_OBJC_SOURCES})
+	list(REMOVE_ITEM BGFX_SOURCES ${BGFX_DIR}/src/amalgamated.cpp)
+	set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.mm)
+else()
+	set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp)
+endif()
+
 if(BGFX_AMALGAMATED)
 	set(BGFX_NOBUILD ${BGFX_SOURCES})
 	list(REMOVE_ITEM BGFX_NOBUILD ${BGFX_AMALGAMATED_SOURCE})
@@ -43,8 +46,7 @@ if(BGFX_AMALGAMATED)
 	endforeach()
 else()
 	# Do not build using amalgamated sources
-	set_source_files_properties(${BGFX_DIR}/src/amalgamated.cpp PROPERTIES HEADER_FILE_ONLY ON)
-	set_source_files_properties(${BGFX_DIR}/src/amalgamated.mm PROPERTIES HEADER_FILE_ONLY ON)
+	set_source_files_properties(${BGFX_AMALGAMATED_SOURCE} PROPERTIES HEADER_FILE_ONLY ON)
 endif()

 # Create the bgfx target
Author	SHA1	Message	Date
Matt Tytel	a952acef35	Make sure mm files aren't globbed on non-apple computers	2025-10-29 21:44:41 -04:00
Jason Millard	dddc79f2ee	Add missing validate_graph.cpp to fix dependabot builds	2025-10-22 17:49:15 -04:00
dependabot[bot]	fbf0903e50	build(deps): bump the submodules group with 2 updates Bumps the submodules group with 2 updates: [bgfx](https://github.com/bkaradzic/bgfx) and [bx](https://github.com/bkaradzic/bx). Updates `bgfx` from `7a70927` to `b0e9cbd` - [Commits](`7a70927d2a...b0e9cbd110`) Updates `bx` from `eda3839` to `59d9249` - [Commits](`eda38395dd...59d9249854`) --- updated-dependencies: - dependency-name: bgfx dependency-version: b0e9cbd11041a602067ef00b22a281a922f8e1b2 dependency-type: direct:production dependency-group: submodules - dependency-name: bx dependency-version: 59d9249854f1f588dc9e7a79549fe954bcd8a5e7 dependency-type: direct:production dependency-group: submodules ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-22 17:49:15 -04:00
dependabot[bot]	5f3f4f2972	build(deps): bump the submodules group with 3 updates Bumps the submodules group with 3 updates: [bgfx](https://github.com/bkaradzic/bgfx), [bx](https://github.com/bkaradzic/bx) and [bimg](https://github.com/bkaradzic/bimg). Updates `bgfx` from `23baae9` to `7a70927` - [Commits](`23baae9e00...7a70927d2a`) Updates `bx` from `d858859` to `eda3839` - [Commits](`d858859d17...eda38395dd`) Updates `bimg` from `3af74f3` to `a1a2ae3` - [Commits](`3af74f3fe1...a1a2ae3c12`) --- updated-dependencies: - dependency-name: bgfx dependency-version: 7a70927d2af7ffcc5cef9c9e8f4c821e31fcb099 dependency-type: direct:production dependency-group: submodules - dependency-name: bx dependency-version: eda38395ddfdeba08c46653b93b8d5bb21f2c863 dependency-type: direct:production dependency-group: submodules - dependency-name: bimg dependency-version: a1a2ae3c129d8c33e765eecd91801bffd985c317 dependency-type: direct:production dependency-group: submodules ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-10 14:45:34 -04:00
dependabot[bot]	bd755d6c91	build(deps): bump the submodules group with 2 updates Bumps the submodules group with 2 updates: [bgfx](https://github.com/bkaradzic/bgfx) and [bimg](https://github.com/bkaradzic/bimg). Updates `bgfx` from `14e0aa5` to `23baae9` - [Commits](`14e0aa5aff...23baae9e00`) Updates `bimg` from `446b9eb` to `3af74f3` - [Commits](`446b9eb111...3af74f3fe1`) --- updated-dependencies: - dependency-name: bgfx dependency-version: 23baae9e0010ee03edd8904fc7e176c76f4f8e2c dependency-type: direct:production dependency-group: submodules - dependency-name: bimg dependency-version: 3af74f3fe1a36c1ce17d2443c352eb8dbb3a5bd4 dependency-type: direct:production dependency-group: submodules ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-03 19:21:05 -04:00