diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2025-04-16 18:25:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-16 18:25:21 -0400 |
| commit | be9339b80b805834bbf82091723de811fff817ef (patch) | |
| tree | b1ec365cd7a5a473165606110f840e361f18878e /CMake | |
| parent | 3dc8dab68eb8993e1736b0af40b5ce04aaf84edf (diff) | |
Bump extraction tools and bring over OOT changes (#1120)
* Bump extraction tools and bring over OOT changes
* Fix appimage
* Fix again
* Fix path for builtin extractor
* Fix mac hopefully
* Remove 's'
* update gitmodules
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/copy-existing-otrs.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMake/copy-existing-otrs.cmake b/CMake/copy-existing-otrs.cmake index 882788c3a..8429a61e9 100644 --- a/CMake/copy-existing-otrs.cmake +++ b/CMake/copy-existing-otrs.cmake @@ -1,12 +1,12 @@ message(STATUS "Copying otr files...") # Copy and rename mm.zip to mm.o2r -if(NOT ONLY2SHIPOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/mm.zip) - execute_process(COMMAND ${CMAKE_COMMAND} -E copy mm.zip ${SOURCE_DIR}/mm.o2r) - execute_process(COMMAND ${CMAKE_COMMAND} -E copy mm.zip ${BINARY_DIR}/mm/mm.o2r) +if(NOT ONLY2SHIPOTR AND EXISTS ${SOURCE_DIR}/mm/mm.o2r) + execute_process(COMMAND ${CMAKE_COMMAND} -E copy mm.o2r ${SOURCE_DIR}/mm.o2r) + execute_process(COMMAND ${CMAKE_COMMAND} -E copy mm.o2r ${BINARY_DIR}/mm/mm.o2r) message(STATUS "Copied mm.zip") endif() -if(EXISTS ${SOURCE_DIR}/OTRExporter/2ship.o2r) +if(EXISTS ${SOURCE_DIR}/mm/2ship.o2r) execute_process(COMMAND ${CMAKE_COMMAND} -E copy 2ship.o2r ${SOURCE_DIR}) execute_process(COMMAND ${CMAKE_COMMAND} -E copy 2ship.o2r ${BINARY_DIR}/mm/) message(STATUS "Copied 2ship.o2r") @@ -14,8 +14,8 @@ endif() # Additionally for Windows, copy the otrs to the target dir, side by side with 2ship.exe if(SYSTEM_NAME MATCHES "Windows") - if(NOT ONLY2SHIPOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/mm.zip) - execute_process(COMMAND ${CMAKE_COMMAND} -E copy mm.zip ${TARGET_DIR}/mm.o2r) + if(NOT ONLY2SHIPOTR AND EXISTS ${SOURCE_DIR}/mm/mm.o2r) + execute_process(COMMAND ${CMAKE_COMMAND} -E copy mm.o2r ${TARGET_DIR}/mm.o2r) endif() if(EXISTS ${SOURCE_DIR}/OTRExporter/2ship.o2r) execute_process(COMMAND ${CMAKE_COMMAND} -E copy 2ship.o2r ${TARGET_DIR}) |