Properly export when making shared library

Fixes using a dll in windows
Add BGFX_CONFIG_DEBUG_ANNOTATION option
2026-02-17 21:12:35 +01:00 · 2022-12-03 13:59:15 -05:00 · 2022-12-03 13:59:05 -05:00 · 2022-12-03 13:58:25 -05:00 · 2022-12-02 17:35:52 -05:00 · 2022-12-02 17:35:46 -05:00
6 changed files with 24 additions and 21 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,11 +25,11 @@ jobs:
      - id: version
        run: |
          API_VERSION=$(grep -Eo "BGFX_API_VERSION UINT32_C\([0-9]+\)" bgfx/include/bgfx/defines.h | grep -Eo "[0-9]+" | tail -1)
-          REVISION=$(cd bgfx && git rev-list HEAD --count)
+          BGFX_REVISION=$(cd bgfx && git rev-list HEAD --count)
+          BGFX_CMAKE_REVISION=$(git rev-list HEAD --count)
          SHA=$(cd bgfx && git rev-parse HEAD)
-          SHA7="${GITHUB_SHA::7}"
-          TAG="v1.${API_VERSION}.${REVISION}-${SHA7}"
-          echo "::set-output name=revision::${REVISION}"
+          TAG="v1.${API_VERSION}.${BGFX_REVISION}-${BGFX_CMAKE_REVISION}"
+          echo "::set-output name=revision::${BGFX_REVISION}"
          echo "::set-output name=sha::${SHA}"
          echo "::set-output name=tag::${TAG}"

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,19 +25,20 @@ 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_TOOLS_SHADER         "Build bgfx shader tools."                      ON  )
-option( BGFX_BUILD_TOOLS_GEOMETRY       "Build bgfx geometry tools."                    ON  )
-option( BGFX_BUILD_TOOLS_TEXTURE        "Build bgfx texture 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 )
-option( BX_CONFIG_DEBUG                 "Log debug messages (default: on in debug)"     OFF )
+option( BX_AMALGAMATED                  "Amalgamated bx build for faster compilation"         OFF )
+option( BX_CONFIG_DEBUG                 "Log debug messages (default: on in debug)"           OFF )
+option( BGFX_AMALGAMATED                "Amalgamated bgfx build for faster compilation"       OFF )
+option( BGFX_BUILD_TOOLS                "Build bgfx tools."                                   ON  )
+option( BGFX_BUILD_TOOLS_SHADER         "Build bgfx shader tools."                            ON  )
+option( BGFX_BUILD_TOOLS_GEOMETRY       "Build bgfx geometry tools."                          ON  )
+option( BGFX_BUILD_TOOLS_TEXTURE        "Build bgfx texture 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_CONFIG_MULTITHREADED       "Build bgfx with multithreaded configuration"         ON )
+option( BGFX_CONFIG_RENDERER_WEBGPU     "Enable the webgpu renderer"                          OFF )
+option( BGFX_CONFIG_DEBUG_ANNOTATION    "Enable gfx debug annotations (default: on in debug)" 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/2
+++ b/2
--- a/cmake/bgfx.cmake
+++ b/cmake/bgfx.cmake
@@ -44,6 +44,7 @@ if(BGFX_LIBRARY_TYPE STREQUAL STATIC)
    add_library( bgfx STATIC ${BGFX_SOURCES} )
 else()
    add_library( bgfx SHARED ${BGFX_SOURCES} )
+    target_compile_definitions( bgfx PUBLIC BGFX_SHARED_LIB_BUILD=1 )
 endif()

 if(BGFX_CONFIG_RENDERER_WEBGPU)
@@ -103,7 +104,8 @@ endif()
 # Add debug config required in bx headers since bx is private
 target_compile_definitions(bgfx
       PUBLIC
-               "BX_CONFIG_DEBUG=$<IF:$<CONFIG:Debug>,1,$<BOOL:${BX_CONFIG_DEBUG}>>"
+               "BX_CONFIG_DEBUG=$<OR:$<CONFIG:Debug>,$<BOOL:${BX_CONFIG_DEBUG}>>"
+               "BGFX_CONFIG_DEBUG_ANNOTATION=$<AND:$<NOT:$<STREQUAL:${CMAKE_SYSTEM_NAME},WindowsStore>>,$<OR:$<CONFIG:Debug>,$<BOOL:${BGFX_CONFIG_DEBUG_ANNOTATION}>>>"
               "BGFX_CONFIG_MULTITHREADED=$<BOOL:${BGFX_CONFIG_MULTITHREADED}>"
 )
Author	SHA1	Message	Date
Sandy Carter	cfc015871f	Properly export when making shared library Fixes using a dll in windows	2022-12-03 13:59:15 -05:00
Sandy Carter	54aaa9103d	Add BGFX_CONFIG_DEBUG_ANNOTATION option Disable for WindowsStore (UWP)	2022-12-03 13:59:05 -05:00
Sandy	2d7b0296f6	Use commit count for tag In the case where the cmake package has been updated but bgfx submodules haven't it is more informative to have the commit count than the sha.	2022-12-03 13:58:25 -05:00
dependabot[bot]	a59e0a63ae	build(deps): bump bx from `20efa22` to `aed1086` Bumps [bx](https://github.com/bkaradzic/bx) from `20efa22` to `aed1086`. - [Release notes](https://github.com/bkaradzic/bx/releases) - [Commits](`20efa22f18...aed1086c48`) --- updated-dependencies: - dependency-name: bx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-02 17:35:52 -05:00
dependabot[bot]	671c819e85	build(deps): bump bgfx from `6a03a1e` to `66de825` Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `6a03a1e` to `66de825`. - [Release notes](https://github.com/bkaradzic/bgfx/releases) - [Commits](`6a03a1ec5e...66de825e6f`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-02 17:35:46 -05:00
dependabot[bot]	c825dcf256	build(deps): bump bimg from `225dad7` to `85109d7` Bumps [bimg](https://github.com/bkaradzic/bimg) from `225dad7` to `85109d7`. - [Release notes](https://github.com/bkaradzic/bimg/releases) - [Commits](`225dad7441...85109d7cdb`) --- updated-dependencies: - dependency-name: bimg dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-02 17:35:38 -05:00