diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f39cb6e..bf6a1842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,7 +500,7 @@ add_custom_target( DEPENDS Torch WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${TORCH_EXECUTABLE} otr baserom.us.z64 - # COMMAND ${TORCH_EXECUTABLE} pack assets sm64.otr + COMMAND ${TORCH_EXECUTABLE} pack assets sm64.otr COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/smcube.otr" "${CMAKE_BINARY_DIR}/smcube.otr" - # COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/sm64.otr" "${CMAKE_BINARY_DIR}/sm64.otr" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/sm64.otr" "${CMAKE_BINARY_DIR}/sm64.otr" ) diff --git a/Torch b/Torch index 3b647342..59708b4f 160000 --- a/Torch +++ b/Torch @@ -1 +1 @@ -Subproject commit 3b64734201866196e4ca927d9552fb0aef5a3308 +Subproject commit 59708b4f182e1abba81d075fd9bd84bef88e851c