From 49d3feab3962389f17ab1afff2a7c3c22159fbbe Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 18 Apr 2021 12:00:26 -0400 Subject: [PATCH] Fix athena download on win32; update boo --- CMakeLists.txt | 9 +++++++-- extern/boo | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a83f5610..04c672730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,9 +359,14 @@ endif() if (NOT BUILD_ATDNA) set(ATHENA_BASE_URL "https://github.com/libAthena/athena/releases/download/latest") + if (WIN32) + set(ATHENA_EXT 7z) + else() + set(ATHENA_EXT tar.gz) + endif() include(FetchContent) FetchContent_Declare(athena-host - URL "${ATHENA_BASE_URL}/athena-${PLATFORM_NAME}-${ATHENA_HOST_ARCH}.tar.gz") + URL "${ATHENA_BASE_URL}/athena-${PLATFORM_NAME}-${ATHENA_HOST_ARCH}.${ATHENA_EXT}") message(STATUS "Fetching atdna host binary") FetchContent_Populate(athena-host) include(${athena-host_SOURCE_DIR}/lib/cmake/atdna/atdnaConfig.cmake) @@ -490,7 +495,7 @@ add_subdirectory(specter EXCLUDE_FROM_ALL) target_include_directories(specter PRIVATE ${CMAKE_SOURCE_DIR}) target_link_libraries(specter PRIVATE nod) if (NOT CMAKE_CROSSCOMPILING) - add_subdirectory(assetnameparser) + add_subdirectory(assetnameparser EXCLUDE_FROM_ALL) endif () add_compile_definitions(URDE_ZIP_INPUT_STREAM=1) # Enable CZipInputStream now that zlib header is known add_subdirectory(DataSpec) diff --git a/extern/boo b/extern/boo index 09b788d20..e23eedb33 160000 --- a/extern/boo +++ b/extern/boo @@ -1 +1 @@ -Subproject commit 09b788d20b91aba8b3c9084bcf5e8a61f03935e8 +Subproject commit e23eedb338f55cc3fcd47915ac30dd3d625ae9b0