diff --git a/source/Steam DLL/CMakeLists.txt b/source/Steam DLL/CMakeLists.txt index 2170045c3..20ac08ade 100644 --- a/source/Steam DLL/CMakeLists.txt +++ b/source/Steam DLL/CMakeLists.txt @@ -78,7 +78,7 @@ FetchContent_Declare( DirectXMath URL "https://github.com/microsoft/DirectXMath/archive/refs/tags/apr2025.tar.gz" OVERRIDE_FIND_PACKAGE - DOWNLOAD_EXTRACT_TIMESTAMP ON + DOWNLOAD_EXTRACT_TIMESTAMP OFF EXCLUDE_FROM_ALL SYSTEM ) @@ -90,7 +90,7 @@ add_library("Microsoft::DirectXMath" ALIAS "DirectXMath") FetchContent_Declare( DirectXTK URL "https://github.com/microsoft/DirectXTK/archive/refs/tags/jul2025.tar.gz" - DOWNLOAD_EXTRACT_TIMESTAMP ON + DOWNLOAD_EXTRACT_TIMESTAMP OFF OVERRIDE_FIND_PACKAGE EXCLUDE_FROM_ALL SYSTEM @@ -102,8 +102,8 @@ add_library("Microsoft::DirectXTK" ALIAS "DirectXTK") # simpleini - used directly (Util.h). FetchContent_Declare( simpleini - URL "https://github.com/brofield/simpleini/archive/refs/tags/v4.22.tar.gz" - DOWNLOAD_EXTRACT_TIMESTAMP ON + URL "https://github.com/brofield/simpleini/archive/refs/tags/v4.25.tar.gz" + DOWNLOAD_EXTRACT_TIMESTAMP OFF ) FetchContent_MakeAvailable(simpleini) INCLUDE_DIRECTORIES(${simpleini_SOURCE_DIR}) @@ -111,8 +111,8 @@ INCLUDE_DIRECTORIES(${simpleini_SOURCE_DIR}) # rapidcsv - header only, required by CommonLibSSE-NG (find_path "rapidcsv.h"). FetchContent_Declare( rapidcsv - URL "https://github.com/d99kris/rapidcsv/archive/refs/tags/v8.87.tar.gz" - DOWNLOAD_EXTRACT_TIMESTAMP ON + URL "https://github.com/d99kris/rapidcsv/archive/refs/tags/v8.90.tar.gz" + DOWNLOAD_EXTRACT_TIMESTAMP OFF OVERRIDE_FIND_PACKAGE ) FetchContent_MakeAvailable(rapidcsv) @@ -123,22 +123,16 @@ set(SPDLOG_INSTALL ON CACHE BOOL " " FORCE) set(SPDLOG_USE_STD_FORMAT ON CACHE BOOL " " FORCE) FetchContent_Declare( spdlog - URL "https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.tar.gz" - DOWNLOAD_EXTRACT_TIMESTAMP ON + URL "https://github.com/gabime/spdlog/archive/refs/tags/v1.17.0.tar.gz" + DOWNLOAD_EXTRACT_TIMESTAMP OFF OVERRIDE_FIND_PACKAGE ) FetchContent_MakeAvailable(spdlog) -# xbyak - required by CommonLibSSE-NG when SKSE_SUPPORT_XBYAK is on. -FetchContent_Declare( - xbyak - URL "https://github.com/herumi/xbyak/archive/v7.28.tar.gz" - DOWNLOAD_EXTRACT_TIMESTAMP ON -) -FetchContent_MakeAvailable(xbyak) - # CommonLibSSE-NG - pinned commit (SE + AE + VR runtime support). -set(SKSE_SUPPORT_XBYAK ON CACHE BOOL " " FORCE) +# No engine patches here, so xbyak trampoline support stays off (FORCE flips +# the stale ON left in caches configured before xbyak was dropped). +set(SKSE_SUPPORT_XBYAK OFF CACHE BOOL " " FORCE) set(ENABLE_SKYRIM_SE ON CACHE BOOL " " FORCE) set(ENABLE_SKYRIM_AE ON CACHE BOOL " " FORCE) set(ENABLE_SKYRIM_VR ON CACHE BOOL " " FORCE) @@ -146,8 +140,8 @@ set(BUILD_TESTS OFF CACHE BOOL " " FORCE) message(STATUS "Fetching CommonLibSSE-NG...") FetchContent_Declare( CommonLibSSE - GIT_REPOSITORY https://github.com/eddoursul/CommonLibVR.git - GIT_TAG 5e5417e3585c9434295e919bdda27737244e9c5a + GIT_REPOSITORY https://github.com/alandtse/CommonLibVR + GIT_TAG aacbd76c01bff9381e253ffdfcb4f9d5f263f1df ) FetchContent_MakeAvailable(CommonLibSSE) @@ -168,13 +162,11 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/st target_link_libraries(CommonLibSSE PUBLIC DirectXTK - xbyak ) target_link_libraries(${PROJECT_NAME} PUBLIC CommonLibSSE::CommonLibSSE spdlog Version.lib - xbyak ) target_include_directories(${PROJECT_NAME}