Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[nx_tzdb] test: try cpm approach w/ msvc (#2709)

crueter3f725c979dcf
diff --git a/externals/nx_tzdb/CMakeLists.txt b/externals/nx_tzdb/CMakeLists.txt
index a51939f7c8..efb3e2b058 100644
--- a/externals/nx_tzdb/CMakeLists.txt
+++ b/externals/nx_tzdb/CMakeLists.txt
@@ -35,17 +35,14 @@ endif()
if(NOT YUZU_TZDB_PATH STREQUAL "")
set(NX_TZDB_BASE_DIR "${YUZU_TZDB_PATH}")
- set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo")
-elseif (MSVC)
- # TODO(crueter): This is a terrible solution, but MSVC fails to link without it
- # Need to investigate further but I still can't reproduce...
+elseif (MSVC AND NOT CXX_CLANG AND YUZU_ENABLE_LTO)
+ # TODO(crueter): boot up the windows vm
set(NX_TZDB_VERSION "250725")
set(NX_TZDB_ARCHIVE "${CPM_SOURCE_CACHE}/nx_tzdb/${NX_TZDB_VERSION}.zip")
set(NX_TZDB_BASE_DIR "${CPM_SOURCE_CACHE}/nx_tzdb/tz")
- set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo")
- set(NX_TZDB_DOWNLOAD_URL "https://github.com/crueter/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
+ set(NX_TZDB_DOWNLOAD_URL "https://git.crueter.xyz/misc/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE}
@@ -65,14 +62,11 @@ else()
message(STATUS "Downloading time zone data...")
AddJsonPackage(tzdb)
- target_include_directories(nx_tzdb
- INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
- INTERFACE ${NX_TZDB_INCLUDE_DIR})
-
- set(NX_TZDB_BASE_DIR "${CPM_SOURCE_CACHE}/nx_tzdb")
- set(NX_TZDB_TZ_DIR "${nx_tzdb_SOURCE_DIR}")
+ set(NX_TZDB_BASE_DIR "${nx_tzdb_SOURCE_DIR}")
endif()
+set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo")
+
target_include_directories(nx_tzdb
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
INTERFACE ${NX_TZDB_INCLUDE_DIR})
diff --git a/externals/nx_tzdb/cpmfile.json b/externals/nx_tzdb/cpmfile.json
index feb9daf7da..00507a85e3 100644
--- a/externals/nx_tzdb/cpmfile.json
+++ b/externals/nx_tzdb/cpmfile.json
@@ -3,9 +3,9 @@
"package": "nx_tzdb",
"repo": "misc/tzdb_to_nx",
"git_host": "git.crueter.xyz",
- "artifact": "%VERSION%.zip",
+ "artifact": "%VERSION%.tar.gz",
"tag": "%VERSION%",
- "hash": "8f60b4b29f285e39c0443f3d5572a73780f3dbfcfd5b35004451fadad77f3a215b2e2aa8d0fffe7e348e2a7b0660882b35228b6178dda8804a14ce44509fd2ca",
- "version": "250725"
+ "hash": "87abb2aeca716d5d77b05317086dbc2f8acfc2f3f76ce4778345ee3df19973e6cd8ecbf16cfab5ad94c9636a6c44fd3588f9aadd3cba89403cfd56c8bec645c5",
+ "version": "091025"
}
}