Merge pull request #233 from bwrsandman/preprocessor

bx: Add /Zc:preprocessor
2026-02-17 21:12:35 +01:00 · 2024-06-16 13:51:25 +03:00 · 2024-06-15 19:34:35 -04:00 · 2024-06-01 14:36:24 -04:00 · 2024-05-19 16:13:58 -04:00 · 2024-05-19 11:38:19 -04:00
7 changed files with 22 additions and 23 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,6 @@ if(APPLE AND NOT XCODE)
 	set(CMAKE_CXX_FLAGS "-ObjC++")
 endif()

-if(MSVC AND (MSVC_VERSION GREATER_EQUAL 1914))
-	add_compile_options("/Zc:__cplusplus")
-endif()
-
 include(CMakeDependentOption)

 option(BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF)
@@ -38,6 +34,10 @@ cmake_dependent_option(BGFX_BUILD_TOOLS_GEOMETRY "Build bgfx geometry tools." ON
 cmake_dependent_option(BGFX_BUILD_TOOLS_TEXTURE "Build bgfx texture tools." ON BGFX_BUILD_TOOLS OFF)
 set(BGFX_TOOLS_PREFIX "" CACHE STRING "Prefix name to add to name of tools (to avoid clashes)")
 option(BGFX_BUILD_EXAMPLES "Build bgfx examples." ON)
+cmake_dependent_option(
+	BGFX_BUILD_EXAMPLE_COMMON "Build bgfx example-common project." OFF "NOT BGFX_BUILD_EXAMPLES;NOT BGFX_BUILD_TOOLS"
+	ON
+)
 option(BGFX_BUILD_TESTS "Build bgfx tests." OFF)
 option(BGFX_INSTALL "Create installation target." ON)
 cmake_dependent_option(
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -14,10 +14,7 @@ macro(_bgfx_crosscompile_use_host_tool TOOL_NAME)
 		find_program(
 			${TOOL_NAME}_EXECUTABLE
 			NAMES bgfx-${TOOL_NAME} ${TOOL_NAME}
-			PATHS /usr/bin #
-					${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/bgfx_x64-linux/tools/bgfx
-					${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/bgfx_x64-windows/tools/bgfx
-					${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/bgfx_x64-osx/tools/bgfx
+			PATHS @BGFX_ADDITIONAL_TOOL_PATHS@ /usr/bin
 		)
 		add_executable(bgfx::${TOOL_NAME} IMPORTED)
 		set_target_properties(bgfx::${TOOL_NAME} PROPERTIES IMPORTED_LOCATION "${${TOOL_NAME}_EXECUTABLE}")
--- a/cmake/bgfx/examples.cmake
+++ b/cmake/bgfx/examples.cmake
@@ -263,17 +263,19 @@ if(BGFX_CUSTOM_TARGETS)
 endif()

 # Add common library for examples
-add_example(
-	common
-	COMMON
-	DIRECTORIES
-	${BGFX_DIR}/examples/common/debugdraw
-	${BGFX_DIR}/examples/common/entry
-	${BGFX_DIR}/examples/common/font
-	${BGFX_DIR}/examples/common/imgui
-	${BGFX_DIR}/examples/common/nanovg
-	${BGFX_DIR}/examples/common/ps
-)
+if(BGFX_BUILD_EXAMPLE_COMMON)
+	add_example(
+		common
+		COMMON
+		DIRECTORIES
+		${BGFX_DIR}/examples/common/debugdraw
+		${BGFX_DIR}/examples/common/entry
+		${BGFX_DIR}/examples/common/font
+		${BGFX_DIR}/examples/common/imgui
+		${BGFX_DIR}/examples/common/nanovg
+		${BGFX_DIR}/examples/common/ps
+	)
+endif()

 # Only add examples if set, otherwise we still need exmaples common for tools
 if(BGFX_BUILD_EXAMPLES)
--- a/cmake/bx/bx.cmake
+++ b/cmake/bx/bx.cmake
@@ -92,7 +92,7 @@ target_compile_definitions(bx PUBLIC "__STDC_CONSTANT_MACROS")

 target_compile_features(bx PUBLIC cxx_std_14)
 # (note: see bx\scripts\toolchain.lua for equivalent compiler flag)
-target_compile_options(bx PUBLIC $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus>)
+target_compile_options(bx PUBLIC $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus /Zc:preprocessor>)

 # Link against psapi on Windows
 if(WIN32)
Author	SHA1	Message	Date
exdal	c2b7416a58	Merge pull request #233 from bwrsandman/preprocessor bx: Add /Zc:preprocessor	2024-06-16 13:51:25 +03:00
Sandy Carter	c0ce1388cc	bx: Add /Zc:preprocessor	2024-06-15 19:34:35 -04:00
dependabot[bot]	19cb98d40b	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 `57d8a08` to `00fa5ad` - [Commits](`57d8a0838b...00fa5ad179`) Updates `bx` from `34ba9c7` to `d171a0f` - [Commits](`34ba9c7a5c...d171a0f264`) Updates `bimg` from `e9fa0ce` to `98a40e8` - [Commits](`e9fa0ceff2...98a40e8533`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production dependency-group: submodules - dependency-name: bx dependency-type: direct:production dependency-group: submodules - dependency-name: bimg dependency-type: direct:production dependency-group: submodules ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-01 14:36:24 -04:00
Sandy Carter	701d84c222	tools: Add an option to insert search paths for tools	2024-05-19 16:13:58 -04:00
Sandy Carter	5940bb7cf8	tools: Rely on CMAKE_PROGRAM_PATH for finding tools	2024-05-19 11:38:19 -04:00
Sandy Carter	2fcbf437f2	tools: for vcpkg hint, use host install path	2024-05-19 07:31:02 -04:00
Jimmy Lord	d7f59648a8	ew option to allow "example-common" project to not be included in build. (#225 ) * Added a new option to allow "example-common" project to not be included in build. * Set BGFX_BUILD_EXAMPLE_COMMON as a dependent option, it will be set ON if either tools or examples are included in the build, OFF otherwise. * cmake format Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Sandy <bwrsandman@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-05-18 20:42:20 -04:00