Merge pull request #138 from bkaradzic/dependabot/submodules/bx-aa5090b

build(deps): bump bx from `6332fb0` to `aa5090b`
Merge pull request #139 from bkaradzic/dependabot/submodules/bgfx-b38389f
2026-02-17 21:12:35 +01:00 · 2022-07-17 18:16:53 +03:00 · 2022-07-17 18:16:45 +03:00 · 2022-07-01 16:03:21 +00:00 · 2022-07-01 16:03:20 +00:00 · 2022-06-24 11:42:25 +03:00
4 changed files with 20 additions and 11 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,14 +21,19 @@ if( APPLE AND NOT XCODE )
 	set( CMAKE_CXX_FLAGS "-ObjC++" )
 endif()

-option( BGFX_BUILD_TOOLS      "Build bgfx tools."                             ON  )
-option( BGFX_BUILD_EXAMPLES   "Build bgfx examples."                          ON  )
-option( BGFX_INSTALL          "Create installation target."                   ON  )
-option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes."          OFF )
-option( BGFX_CUSTOM_TARGETS   "Include convenience custom targets."           ON  )
-option( BGFX_AMALGAMATED      "Amalgamated bgfx build for faster compilation" OFF )
-option( BX_AMALGAMATED        "Amalgamated bx build for faster compilation"   OFF )
-option( BGFX_CONFIG_RENDERER_WEBGPU     "Enables the webgpu renderer"         OFF )
+if (MSVC AND (MSVC_VERSION GREATER_EQUAL 1914))
+    add_compile_options("/Zc:__cplusplus")
+endif()
+
+option( BGFX_BUILD_TOOLS                "Build bgfx tools."                             ON  )
+option( BGFX_BUILD_EXAMPLES             "Build bgfx examples."                          ON  )
+option( BGFX_INSTALL                    "Create installation target."                   ON  )
+option( BGFX_INSTALL_EXAMPLES           "Install examples and their runtimes."          OFF )
+option( BGFX_CUSTOM_TARGETS             "Include convenience custom targets."           ON  )
+option( BGFX_AMALGAMATED                "Amalgamated bgfx build for faster compilation" OFF )
+option( BX_AMALGAMATED                  "Amalgamated bx build for faster compilation"   OFF )
+option( BGFX_CONFIG_MULTITHREADED       "Build bgfx with multithreaded configuration"   ON )
+option( BGFX_CONFIG_RENDERER_WEBGPU     "Enables the webgpu renderer"                   OFF )

 set( BGFX_OPENGL_VERSION   ""       CACHE STRING "Specify minimum opengl version" )
 set( BGFX_OPENGLES_VERSION ""       CACHE STRING "Specify minimum OpenGL ES version" )
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/cmake/bgfx.cmake
+++ b/cmake/bgfx.cmake
@@ -70,7 +70,11 @@ if( MSVC )
 endif()

 # Add debug config required in bx headers since bx is private
-target_compile_definitions(bgfx PUBLIC "BX_CONFIG_DEBUG=$<CONFIG:Debug>")
+target_compile_definitions(bgfx
+       PUBLIC
+               "BX_CONFIG_DEBUG=$<CONFIG:Debug>"
+               "BGFX_CONFIG_MULTITHREADED=$<BOOL:${BGFX_CONFIG_MULTITHREADED}>"
+)

 # Includes
 target_include_directories( bgfx
Author	SHA1	Message	Date
loanselot	9ac6e08121	Merge pull request #138 from bkaradzic/dependabot/submodules/bx-aa5090b build(deps): bump bx from `6332fb0` to `aa5090b`	2022-07-17 18:16:53 +03:00
loanselot	6c75503da4	Merge pull request #139 from bkaradzic/dependabot/submodules/bgfx-b38389f build(deps): bump bgfx from `9204a53` to `b38389f`	2022-07-17 18:16:45 +03:00
dependabot[bot]	3dcf049202	build(deps): bump bgfx from `9204a53` to `b38389f` Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `9204a53` to `b38389f`. - [Release notes](https://github.com/bkaradzic/bgfx/releases) - [Commits](`9204a536dd...b38389f04e`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-01 16:03:21 +00:00
dependabot[bot]	3ec2a51aef	build(deps): bump bx from `6332fb0` to `aa5090b` Bumps [bx](https://github.com/bkaradzic/bx) from `6332fb0` to `aa5090b`. - [Release notes](https://github.com/bkaradzic/bx/releases) - [Commits](`6332fb0305...aa5090bbd8`) --- updated-dependencies: - dependency-name: bx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-01 16:03:20 +00:00
e-erdal	896ab5478c	Add `__cplusplus` for MSVC	2022-06-24 11:42:25 +03:00
loanselot	23a1dc204a	Merge pull request #135 from bkaradzic/dependabot/submodules/bx-6332fb0 build(deps): bump bx from `8832707` to `6332fb0`	2022-06-24 11:36:57 +03:00
loanselot	5fa58aad11	Merge pull request #136 from bkaradzic/dependabot/submodules/bgfx-9204a53 build(deps): bump bgfx from `379fc70` to `9204a53`	2022-06-24 11:36:49 +03:00
dependabot[bot]	8dafd0d9e4	build(deps): bump bgfx from `379fc70` to `9204a53` Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `379fc70` to `9204a53`. - [Release notes](https://github.com/bkaradzic/bgfx/releases) - [Commits](`379fc707ff...9204a536dd`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 16:03:24 +00:00
dependabot[bot]	3bac602264	build(deps): bump bx from `8832707` to `6332fb0` Bumps [bx](https://github.com/bkaradzic/bx) from `8832707` to `6332fb0`. - [Release notes](https://github.com/bkaradzic/bx/releases) - [Commits](`88327070b9...6332fb0305`) --- updated-dependencies: - dependency-name: bx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 16:03:20 +00:00
loanselot	1b2b921bde	Merge pull request #134 from bkaradzic/dependabot/submodules/bgfx-379fc70 build(deps): bump bgfx from `5ae2271` to `379fc70`	2022-05-04 12:26:41 +03:00
loanselot	374dcbba70	Merge pull request #133 from bkaradzic/dependabot/submodules/bx-8832707 build(deps): bump bx from `ad018d4` to `8832707`	2022-05-04 12:26:26 +03:00
dependabot[bot]	95af1cc54d	build(deps): bump bgfx from `5ae2271` to `379fc70` Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `5ae2271` to `379fc70`. - [Release notes](https://github.com/bkaradzic/bgfx/releases) - [Commits](`5ae2271667...379fc707ff`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-01 16:01:28 +00:00
dependabot[bot]	e85f8c0f3c	build(deps): bump bx from `ad018d4` to `8832707` Bumps [bx](https://github.com/bkaradzic/bx) from `ad018d4` to `8832707`. - [Release notes](https://github.com/bkaradzic/bx/releases) - [Commits](`ad018d47c6...88327070b9`) --- updated-dependencies: - dependency-name: bx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-01 16:01:26 +00:00
loanselot	9ecbe9ee51	Merge pull request #131 from bkaradzic/dependabot/submodules/bgfx-5ae2271 Bump bgfx from `ae7aeba` to `5ae2271`	2022-04-12 02:24:53 +03:00
Sandy Carter	d725e78f86	bgfx: Add BGFX_MULTITHREADED option	2022-04-10 22:30:07 -04:00
dependabot[bot]	93de01a1af	Bump bgfx from `ae7aeba` to `5ae2271` Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `ae7aeba` to `5ae2271`. - [Release notes](https://github.com/bkaradzic/bgfx/releases) - [Commits](`ae7aeba72c...5ae2271667`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-01 16:02:10 +00:00