eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

oops
All checks were successful
eden-license / license-header (pull_request) Successful in 34s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-10-09 22:17:02 -04:00
parent 8ac8bfbfcb
commit 2ac0e5fddd
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
externals/nx_tzdb/CMakeLists.txt vendored
View file

@ -35,7 +35,6 @@ endif()
if(NOT YUZU_TZDB_PATH STREQUAL "") if(NOT YUZU_TZDB_PATH STREQUAL "")
set(NX_TZDB_BASE_DIR "${YUZU_TZDB_PATH}") set(NX_TZDB_BASE_DIR "${YUZU_TZDB_PATH}")
set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo")
elseif (OFF) # (MSVC AND NOT CXX_CLANG) elseif (OFF) # (MSVC AND NOT CXX_CLANG)
# TODO(crueter): This is a terrible solution, but MSVC fails to link without it # TODO(crueter): This is a terrible solution, but MSVC fails to link without it
# Need to investigate further but I still can't reproduce... # Need to investigate further but I still can't reproduce...
@ -43,9 +42,8 @@ elseif (OFF) # (MSVC AND NOT CXX_CLANG)
set(NX_TZDB_ARCHIVE "${CPM_SOURCE_CACHE}/nx_tzdb/${NX_TZDB_VERSION}.zip") 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_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}...") message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE} file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE}
@ -65,10 +63,11 @@ else()
message(STATUS "Downloading time zone data...") message(STATUS "Downloading time zone data...")
AddJsonPackage(tzdb) AddJsonPackage(tzdb)
set(NX_TZDB_BASE_DIR "${CPM_SOURCE_CACHE}/nx_tzdb") set(NX_TZDB_BASE_DIR "${nx_tzdb_SOURCE_DIR}")
set(NX_TZDB_TZ_DIR "${nx_tzdb_SOURCE_DIR}")
endif() endif()
set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo")
target_include_directories(nx_tzdb target_include_directories(nx_tzdb
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
INTERFACE ${NX_TZDB_INCLUDE_DIR}) INTERFACE ${NX_TZDB_INCLUDE_DIR})