PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-13 13:35:18 +03:00
Code Issues Actions 2 Packages Projects Releases 1 Wiki Activity

Bump torch and renamed external lib

Browse Source
This commit is contained in:
KiritoDv 2024-11-25 10:32:59 -06:00
parent 82c34789ff
commit ebedfdbc6c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -536,16 +536,16 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
endif() endif()
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(Torch ExternalProject_Add(TorchExternal
PREFIX Torch PREFIX TorchExternal
SOURCE_DIR ${CMAKE_SOURCE_DIR}/tools/Torch SOURCE_DIR ${CMAKE_SOURCE_DIR}/tools/Torch
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/Torch CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/Torch
) )
ExternalProject_Get_Property(Torch install_dir) ExternalProject_Get_Property(TorchExternal install_dir)
set(TORCH_EXECUTABLE ${install_dir}/src/Torch-build/$<CONFIGURATION>/torch) set(TORCH_EXECUTABLE ${install_dir}/src/Torch-build/$<CONFIGURATION>/torch)
add_custom_target( add_custom_target(
ExtractAssets ExtractAssets
DEPENDS Torch DEPENDS TorchExternal
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${TORCH_EXECUTABLE} header -o baserom.us.uncompressed.z64 COMMAND ${TORCH_EXECUTABLE} header -o baserom.us.uncompressed.z64
COMMAND ${TORCH_EXECUTABLE} otr baserom.us.uncompressed.z64 COMMAND ${TORCH_EXECUTABLE} otr baserom.us.uncompressed.z64

2
tools/Torch

@ -1 +1 @@
Subproject commit 339f9c485a2dd1d418307ffceef1f56de5aa02ff Subproject commit ad2a81221bb596caeaff156848c8f5476a7a72b6