From 6af150fa4bd7a9d2c996dbfcc6ef3208873630ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Jul 2021 16:12:22 +0000 Subject: [PATCH 1/2] Bump bimg from `8355d36` to `1bf3313` Bumps [bimg](https://github.com/bkaradzic/bimg) from `8355d36` to `1bf3313`. - [Release notes](https://github.com/bkaradzic/bimg/releases) - [Commits](https://github.com/bkaradzic/bimg/compare/8355d36befc90c1db82fca8e54f38bfb7eeb3530...1bf3313ca27ad6f9c5a49b9604ea567fae657423) --- updated-dependencies: - dependency-name: bimg dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- bimg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bimg b/bimg index 8355d36..1bf3313 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 8355d36befc90c1db82fca8e54f38bfb7eeb3530 +Subproject commit 1bf3313ca27ad6f9c5a49b9604ea567fae657423 From cf0d70f7d5a20ff6e4f40e61abff6bff7b37bb3b Mon Sep 17 00:00:00 2001 From: e-erdal Date: Tue, 20 Jul 2021 20:15:03 +0300 Subject: [PATCH 2/2] Add tinyexr to build files --- CMakeLists.txt | 2 +- cmake/3rdparty/tinyexr.cmake | 9 +++++++++ cmake/bimg.cmake | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 cmake/3rdparty/tinyexr.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index f089879..84019ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ if( BGFX_INSTALL ) INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) if( NOT BGFX_LIBRARY_TYPE MATCHES "SHARED" ) - install( TARGETS bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc + install( TARGETS bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr EXPORT "${TARGETS_EXPORT_NAME}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/cmake/3rdparty/tinyexr.cmake b/cmake/3rdparty/tinyexr.cmake new file mode 100644 index 0000000..9f72523 --- /dev/null +++ b/cmake/3rdparty/tinyexr.cmake @@ -0,0 +1,9 @@ +if( TARGET tinyexr ) + return() +endif() + +file( GLOB_RECURSE TINYEXR_SOURCES ${BIMG_DIR}/3rdparty/tinyexr/*.c ${BIMG_DIR}/3rdparty/tinyexr/*.h ) + +add_library( tinyexr STATIC ${TINYEXR_SOURCES} ) +target_include_directories( tinyexr PUBLIC $ $ ) +set_target_properties( tinyexr PROPERTIES FOLDER "bgfx/3rdparty" ) \ No newline at end of file diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake index f403771..4c3401f 100644 --- a/cmake/bimg.cmake +++ b/cmake/bimg.cmake @@ -18,6 +18,7 @@ include( cmake/3rdparty/iqa.cmake ) include( cmake/3rdparty/libsquish.cmake ) include( cmake/3rdparty/nvtt.cmake ) include( cmake/3rdparty/pvrtc.cmake ) +include( cmake/3rdparty/tinyexr.cmake ) # Ensure the directory exists if( NOT IS_DIRECTORY ${BIMG_DIR} ) @@ -38,7 +39,7 @@ target_include_directories( bimg $) # bimg dependencies -target_link_libraries( bimg PUBLIC bx PRIVATE astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc ) +target_link_libraries( bimg PUBLIC bx PRIVATE astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr ) # Put in a "bgfx" folder in Visual Studio set_target_properties( bimg PROPERTIES FOLDER "bgfx" ) \ No newline at end of file