From 2f2b00cc057614f405b92d9c69f28094be04bc81 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Sat, 14 Jan 2023 07:55:39 -0500 Subject: [PATCH] Move etc2 to file --- cmake/bimg/3rdparty/etc2.cmake | 25 +++++++++++++++++++++++++ cmake/bimg/CMakeLists.txt | 1 + cmake/bimg/bimg_encode.cmake | 5 +++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 cmake/bimg/3rdparty/etc2.cmake diff --git a/cmake/bimg/3rdparty/etc2.cmake b/cmake/bimg/3rdparty/etc2.cmake new file mode 100644 index 0000000..41bed01 --- /dev/null +++ b/cmake/bimg/3rdparty/etc2.cmake @@ -0,0 +1,25 @@ +# bgfx.cmake - bgfx building in cmake +# Written in 2017 by Joshua Brookover +# +# To the extent possible under law, the author(s) have dedicated all copyright +# and related and neighboring rights to this software to the public domain +# worldwide. This software is distributed without any warranty. +# +# You should have received a copy of the CC0 Public Domain Dedication along with +# this software. If not, see . + +# Ensure the directory exists +if(NOT IS_DIRECTORY ${BIMG_DIR}) + message(SEND_ERROR "Could not load bimg, directory does not exist. ${BIMG_DIR}") + return() +endif() + +if(NOT ETC2_LIBRARIES) + file( + GLOB_RECURSE # + ETC2_SOURCES # + ${BIMG_DIR}/3rdparty/etc2/**.cpp # + ${BIMG_DIR}/3rdparty/etc2/**.hpp # + ) + set(ETC2_INCLUDE_DIR ${BIMG_DIR}/3rdparty) +endif() diff --git a/cmake/bimg/CMakeLists.txt b/cmake/bimg/CMakeLists.txt index a546753..066bbe3 100644 --- a/cmake/bimg/CMakeLists.txt +++ b/cmake/bimg/CMakeLists.txt @@ -11,6 +11,7 @@ include(3rdparty/loadpng.cmake) include(3rdparty/libsquish.cmake) include(3rdparty/astc_encoder.cmake) +include(3rdparty/etc2.cmake) include(3rdparty/nvtt.cmake) include(3rdparty/pvrtc.cmake) include(3rdparty/tinyexr.cmake) diff --git a/cmake/bimg/bimg_encode.cmake b/cmake/bimg/bimg_encode.cmake index 94021ce..8209f16 100644 --- a/cmake/bimg/bimg_encode.cmake +++ b/cmake/bimg/bimg_encode.cmake @@ -25,6 +25,7 @@ target_include_directories( PRIVATE ${BIMG_DIR}/3rdparty # ${LIBSQUISH_INCLUDE_DIR} # ${ASTC_ENCODER_INCLUDE_DIR} + ${ETC2_INCLUDE_DIR} ${NVTT_INCLUDE_DIR} # ${PVRTC_INCLUDE_DIR} ${TINYEXR_INCLUDE_DIR} # @@ -43,8 +44,7 @@ file( ${BIMG_DIR}/3rdparty/edtaa3/**.h # ${BIMG_DIR}/3rdparty/etc1/**.cpp # ${BIMG_DIR}/3rdparty/etc1/**.h # - ${BIMG_DIR}/3rdparty/etc2/**.cpp # - ${BIMG_DIR}/3rdparty/etc2/**.hpp # + ${ETC2_SOURCES} # ${NVTT_SOURCES} # ${PVRTC_SOURCES} # ${TINYEXR_SOURCES} @@ -58,6 +58,7 @@ target_link_libraries( PUBLIC bx # ${LIBSQUISH_LIBRARIES} # ${ASTC_ENCODER_LIBRARIES} # + ${ETC2_LIBRARIES} # ${NVTT_LIBRARIES} ${PVRTC_LIBRARIES} # ${TINYEXR_LIBRARIES} #