feat: compile compressonator for macOS

craftablescience · Jun 29, 2024 · e398815 · e398815
1 parent 6f8e699
commit e398815
Show file tree

Hide file tree

Showing 57 changed files with 70 additions and 45 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,24 +4,26 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
-# Options (General)
+# Options
 option(SOURCEPP_USE_DMXPP               "Build dmxpp library"                       ON)
 option(SOURCEPP_USE_FGDPP               "Build fgdpp library"                       ON)
 option(SOURCEPP_USE_KVPP                "Build kvpp library"                        ON)
 option(SOURCEPP_USE_MDLPP               "Build mdlpp library"                       ON)
 option(SOURCEPP_USE_VICEPP              "Build vicepp library"                      ON)
 option(SOURCEPP_USE_VPKPP               "Build vpkpp library"                       ON)
-if(NOT APPLE)
-    option(SOURCEPP_USE_VTFPP           "Build vtfpp library"                       ON)
-else()
-    set(SOURCEPP_USE_VTFPP OFF CACHE INTERNAL "")
-endif()
+option(SOURCEPP_USE_VTFPP               "Build vtfpp library"                       ON)
 option(SOURCEPP_BUILD_C_WRAPPERS        "Build C wrappers for supported libraries"  ON)
 option(SOURCEPP_BUILD_TESTS             "Build tests for enabled libraries"        OFF)
 option(SOURCEPP_USE_STATIC_MSVC_RUNTIME "Link to static MSVC runtime library"      OFF)
 
 
-# Options (Library)
+# Option overrides
+if(SOURCEPP_USE_VPKPP)
+    set(SOURCEPP_USE_KVPP ON CACHE INTERNAL "")
+endif()
+
+
+# Options per-library
 option(FGDPP_ENABLE_SPEN_FGD_SUPPORT "Enable support for FGD alterations (https://github.com/TeamSpen210/HammerAddons/wiki/Unified-FGD) made by TeamSpen's HammerAddons. Fully backwards compatible with Valve's FGD standard." OFF)
 
 
@@ -41,6 +43,10 @@ if(NOT TARGET bufferstream)
 endif()
 
 
+# compressonator
+add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/compressonator")
+
+
 # cryptopp
 if (NOT TARGET cryptopp::cryptopp)
     set(CRYPTOPP_BUILD_TESTING OFF CACHE INTERNAL "")
@@ -51,7 +57,7 @@ endif()
 
 # ice
 if(SOURCEPP_USE_VICEPP)
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/ice")
+    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/ice")
 endif()
 
 
@@ -81,7 +87,7 @@ endif()
 
 # stb
 if(SOURCEPP_USE_VTFPP)
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/stb")
+    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/stb")
 endif()
 
 
@@ -147,7 +153,6 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(AddPrettyParser)
 include(AddSourcePPLibrary)
-include(TargetLinkCompressonator)
 
 
 # Add libraries

diff --git a/cmake/TargetLinkCompressonator.cmake b/cmake/TargetLinkCompressonator.cmake
diff --git a/ext/compressonator/CMakeLists.txt b/ext/compressonator/CMakeLists.txt
@@ -0,0 +1,36 @@
+set(COMPRESSONATOR_DIR ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "")
+
+function(target_link_compressonator TARGET)
+    if(MSVC)
+        get_target_property(TARGET_MSVC_RUNTIME_LIBRARY ${TARGET} MSVC_RUNTIME_LIBRARY)
+        if((TARGET_MSVC_RUNTIME_LIBRARY MATCHES "NOTFOUND$") OR (TARGET_MSVC_RUNTIME_LIBRARY MATCHES "DLL$"))
+            target_link_libraries(${TARGET} PRIVATE
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/Compressonator_MD$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MD$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MD_AVX$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MD_AVX512$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MD_SSE$<$<CONFIG:Debug>:d>.lib")
+        else()
+            target_link_libraries(${TARGET} PRIVATE
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/Compressonator_MT$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MT$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MT_AVX$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MT_AVX512$<$<CONFIG:Debug>:d>.lib"
+                    "${COMPRESSONATOR_DIR}/lib/win_x86_64/CMP_Core_MT_SSE$<$<CONFIG:Debug>:d>.lib")
+        endif()
+    elseif(APPLE)
+        target_link_libraries(${TARGET} PRIVATE
+                "${COMPRESSONATOR_DIR}/lib/osx_arm64/libCompressonator$<$<CONFIG:Debug>:d>.a"
+                "${COMPRESSONATOR_DIR}/lib/osx_arm64/libCMP_Core$<$<CONFIG:Debug>:d>.a")
+    elseif(UNIX)
+        target_link_libraries(${TARGET} PRIVATE
+                "${COMPRESSONATOR_DIR}/lib/linux_x86_64/libCompressonator$<$<CONFIG:Debug>:d>.a"
+                "${COMPRESSONATOR_DIR}/lib/linux_x86_64/libCMP_Core$<$<CONFIG:Debug>:d>.a"
+                "${COMPRESSONATOR_DIR}/lib/linux_x86_64/libCMP_Core_AVX$<$<CONFIG:Debug>:d>.a"
+                "${COMPRESSONATOR_DIR}/lib/linux_x86_64/libCMP_Core_AVX512$<$<CONFIG:Debug>:d>.a"
+                "${COMPRESSONATOR_DIR}/lib/linux_x86_64/libCMP_Core_SSE$<$<CONFIG:Debug>:d>.a")
+    else()
+        message(FATAL_ERROR "Unable to link to Compressonator library!")
+    endif()
+    target_include_directories(${TARGET} PRIVATE "${COMPRESSONATOR_DIR}/include")
+endfunction()
diff --git a/ext/compressonator/LICENSE b/ext/compressonator/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2024    Advanced Micro Devices, Inc. All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/...y/compressonator/include/Compressonator.h → ext/compressonator/include/Compressonator.h b/...y/compressonator/include/Compressonator.h → ext/compressonator/include/Compressonator.h
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Core.a b/ext/compressonator/lib/linux_x86_64/libCMP_Core.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVX.a b/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVX.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVX512.a b/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVX512.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVX512d.a b/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVX512d.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVXd.a b/ext/compressonator/lib/linux_x86_64/libCMP_Core_AVXd.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Core_SSE.a b/ext/compressonator/lib/linux_x86_64/libCMP_Core_SSE.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Core_SSEd.a b/ext/compressonator/lib/linux_x86_64/libCMP_Core_SSEd.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCMP_Cored.a b/ext/compressonator/lib/linux_x86_64/libCMP_Cored.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCompressonator.a b/ext/compressonator/lib/linux_x86_64/libCompressonator.a
diff --git a/ext/compressonator/lib/linux_x86_64/libCompressonatord.a b/ext/compressonator/lib/linux_x86_64/libCompressonatord.a
diff --git a/ext/compressonator/lib/osx_arm64/libCMP_Core.a b/ext/compressonator/lib/osx_arm64/libCMP_Core.a
diff --git a/ext/compressonator/lib/osx_arm64/libCMP_Cored.a b/ext/compressonator/lib/osx_arm64/libCMP_Cored.a
diff --git a/ext/compressonator/lib/osx_arm64/libCompressonator.a b/ext/compressonator/lib/osx_arm64/libCompressonator.a
diff --git a/ext/compressonator/lib/osx_arm64/libCompressonatord.a b/ext/compressonator/lib/osx_arm64/libCompressonatord.a
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512d.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVX512d.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVXd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_AVXd.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSE.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSE.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSEd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MD_SSEd.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MDd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MDd.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512d.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVX512d.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVXd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_AVXd.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSE.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSE.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSEd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MT_SSEd.lib
diff --git a/ext/compressonator/lib/win_x86_64/CMP_Core_MTd.lib b/ext/compressonator/lib/win_x86_64/CMP_Core_MTd.lib
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MD.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MD.lib
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MDd.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MDd.lib
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MT.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MT.lib
diff --git a/ext/compressonator/lib/win_x86_64/Compressonator_MTd.lib b/ext/compressonator/lib/win_x86_64/Compressonator_MTd.lib
diff --git a/src/thirdparty/ice/CMakeLists.txt → ext/ice/CMakeLists.txt b/src/thirdparty/ice/CMakeLists.txt → ext/ice/CMakeLists.txt
diff --git a/src/thirdparty/ice/include/IceKey.h → ext/ice/include/IceKey.h b/src/thirdparty/ice/include/IceKey.h → ext/ice/include/IceKey.h
diff --git a/src/thirdparty/ice/src/IceKey.cpp → ext/ice/src/IceKey.cpp b/src/thirdparty/ice/src/IceKey.cpp → ext/ice/src/IceKey.cpp
diff --git a/src/thirdparty/stb/CMakeLists.txt → ext/stb/CMakeLists.txt b/src/thirdparty/stb/CMakeLists.txt → ext/stb/CMakeLists.txt
diff --git a/src/thirdparty/stb/LICENSE → ext/stb/LICENSE b/src/thirdparty/stb/LICENSE → ext/stb/LICENSE
diff --git a/src/thirdparty/stb/include/stb_image.h → ext/stb/include/stb_image.h b/src/thirdparty/stb/include/stb_image.h → ext/stb/include/stb_image.h
diff --git a/src/thirdparty/stb/include/stb_image_write.h → ext/stb/include/stb_image_write.h b/src/thirdparty/stb/include/stb_image_write.h → ext/stb/include/stb_image_write.h
diff --git a/src/thirdparty/stb/src/stb_impl.cpp → ext/stb/src/stb_impl.cpp b/src/thirdparty/stb/src/stb_impl.cpp → ext/stb/src/stb_impl.cpp
diff --git a/src/thirdparty/compressonator/LICENSE b/src/thirdparty/compressonator/LICENSE
diff --git a/src/thirdparty/compressonator/lib/linux64/libCMP_Compressonator.a b/src/thirdparty/compressonator/lib/linux64/libCMP_Compressonator.a
diff --git a/src/thirdparty/compressonator/lib/linux64/libCMP_Core.a b/src/thirdparty/compressonator/lib/linux64/libCMP_Core.a
diff --git a/src/thirdparty/compressonator/lib/linux64/libCMP_Core_AVX.a b/src/thirdparty/compressonator/lib/linux64/libCMP_Core_AVX.a
diff --git a/src/thirdparty/compressonator/lib/linux64/libCMP_Core_AVX512.a b/src/thirdparty/compressonator/lib/linux64/libCMP_Core_AVX512.a
diff --git a/src/thirdparty/compressonator/lib/linux64/libCMP_Core_SSE.a b/src/thirdparty/compressonator/lib/linux64/libCMP_Core_SSE.a
diff --git a/src/thirdparty/compressonator/lib/win64/Compressonator_MD.lib b/src/thirdparty/compressonator/lib/win64/Compressonator_MD.lib
diff --git a/src/thirdparty/compressonator/lib/win64/Compressonator_MDd.lib b/src/thirdparty/compressonator/lib/win64/Compressonator_MDd.lib
diff --git a/src/thirdparty/compressonator/lib/win64/Compressonator_MT.lib b/src/thirdparty/compressonator/lib/win64/Compressonator_MT.lib
diff --git a/src/thirdparty/compressonator/lib/win64/Compressonator_MTd.lib b/src/thirdparty/compressonator/lib/win64/Compressonator_MTd.lib