Export bimg_encode and bimg_decode

version: remove newline from version number
Ensure BX_DIR is converted to cmake style path
2026-02-17 21:12:35 +01:00 · 2023-02-11 09:44:45 -05:00 · 2023-02-11 09:44:28 -05:00 · 2023-02-11 09:44:13 -05:00 · 2023-02-09 19:58:33 -05:00 · 2023-01-22 09:31:31 -05:00
6 changed files with 10 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,10 @@ elseif(NOT IS_ABSOLUTE "${BGFX_DIR}")
 	get_filename_component(BGFX_DIR "${BGFX_DIR}" REALPATH BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 endif()

+file(TO_CMAKE_PATH "${BX_DIR}" BX_DIR)
+file(TO_CMAKE_PATH "${BIMG_DIR}" BIMG_DIR)
+file(TO_CMAKE_PATH "${BGFX_DIR}" BGFX_DIR)
+
 # sets project version from api ver / git rev
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake)
 if(BGFX_BUILD_TOOLS AND BGFX_CUSTOM_TARGETS)
@@ -165,7 +169,7 @@ if(BGFX_INSTALL)
 	)
 	if(NOT BGFX_LIBRARY_TYPE MATCHES "SHARED")
 		install(
-			TARGETS bimg bx
+			TARGETS bx bimg bimg_encode bimg_decode
 			EXPORT "${TARGETS_EXPORT_NAME}"
 			LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 			ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
--- 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
@@ -138,6 +138,7 @@ file(
 	${SPIRV_TOOLS}/source/val/validate_primitives.cpp
 	${SPIRV_TOOLS}/source/val/validate_ray_query.cpp
 	${SPIRV_TOOLS}/source/val/validate_ray_tracing.cpp
+	${SPIRV_TOOLS}/source/val/validate_ray_tracing_reorder.cpp
 	${SPIRV_TOOLS}/source/val/validate_scopes.cpp
 	${SPIRV_TOOLS}/source/val/validate_small_type_uses.cpp
 	${SPIRV_TOOLS}/source/val/validate_type.cpp
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -23,7 +23,7 @@ execute_process(
 	COMMAND "${GIT_EXECUTABLE}" -C bgfx rev-list --count HEAD
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 	OUTPUT_VARIABLE GIT_REV_COUNT
-	ERROR_QUIET
+	OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET
 )

 # read version(100) from bgfx.idl
Author	SHA1	Message	Date
Sandy Carter	907dc5fbd7	Export bimg_encode and bimg_decode	2023-02-11 09:44:45 -05:00
Sandy Carter	a0f928864f	version: remove newline from version number	2023-02-11 09:44:28 -05:00
Francis Hart	fad617f66f	Ensure BX_DIR is converted to cmake style path When using the BX_DIR, BIMG_DIR, and BGFX_DIR options to cmake, the pathnames need to be converted to cmake style path. This ensures the paths do not have mixed directory separators later on in the build, which can cause build failures.	2023-02-11 09:44:13 -05:00
dependabot[bot]	fba0379121	build(deps): bump bgfx from `bea82a1` to `6f36b4f` Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `bea82a1` to `6f36b4f`. - [Release notes](https://github.com/bkaradzic/bgfx/releases) - [Commits](`bea82a1343...6f36b4fb3a`) --- updated-dependencies: - dependency-name: bgfx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-09 19:58:33 -05:00
Jamil Halabi	a6cfe968a5	Updated to the latest bgfx	2023-01-22 09:31:31 -05:00