AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix athena download on win32; update boo

This commit is contained in:
Luke Street 2021-04-18 12:00:26 -04:00
parent c995643f9c
commit 49d3feab39
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -359,9 +359,14 @@ endif()
if (NOT BUILD_ATDNA) if (NOT BUILD_ATDNA)
set(ATHENA_BASE_URL "https://github.com/libAthena/athena/releases/download/latest") 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) include(FetchContent)
FetchContent_Declare(athena-host 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") message(STATUS "Fetching atdna host binary")
FetchContent_Populate(athena-host) FetchContent_Populate(athena-host)
include(${athena-host_SOURCE_DIR}/lib/cmake/atdna/atdnaConfig.cmake) 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_include_directories(specter PRIVATE ${CMAKE_SOURCE_DIR})
target_link_libraries(specter PRIVATE nod) target_link_libraries(specter PRIVATE nod)
if (NOT CMAKE_CROSSCOMPILING) if (NOT CMAKE_CROSSCOMPILING)
add_subdirectory(assetnameparser) add_subdirectory(assetnameparser EXCLUDE_FROM_ALL)
endif () endif ()
add_compile_definitions(URDE_ZIP_INPUT_STREAM=1) # Enable CZipInputStream now that zlib header is known add_compile_definitions(URDE_ZIP_INPUT_STREAM=1) # Enable CZipInputStream now that zlib header is known
add_subdirectory(DataSpec) add_subdirectory(DataSpec)

2
extern/boo vendored

@ -1 +1 @@
Subproject commit 09b788d20b91aba8b3c9084bcf5e8a61f03935e8 Subproject commit e23eedb338f55cc3fcd47915ac30dd3d625ae9b0