From f8880eb325f689d26906514ca61bd7ba14c93486 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Fri, 20 Jun 2025 20:20:42 -0400 Subject: [PATCH] Fix --- scripts/linux/appimage/soh.sh.in | 2 +- soh/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/linux/appimage/soh.sh.in b/scripts/linux/appimage/soh.sh.in index dddb0a3c9..37a9c3deb 100644 --- a/scripts/linux/appimage/soh.sh.in +++ b/scripts/linux/appimage/soh.sh.in @@ -306,7 +306,7 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do else echo "Processing..." fi - assets/extractor/ZAPD.out ed -eh -i assets/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1 + assets/extractor/ZAPD.out ed -eh -i assets/xml/"${ROM}" -b tmp/rom.z64 -fl assets/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1 cp "$ASSETDIR"/"$OTRNAME" "$SHIP_HOME" fi else diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index 843e016b2..1847e9ad1 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -613,7 +613,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio") TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor ${CMAKE_BINARY_DIR}/soh/assets - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml ${CMAKE_BINARY_DIR}/soh/assets/xmls + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml ${CMAKE_BINARY_DIR}/soh/assets/xml ) endif() if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS") @@ -622,7 +622,7 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS") POST_BUILD COMMENT "Copying asset xmls..." COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor $/assets - COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $/assets/xmls + COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $/assets/xml COMMAND ${CMAKE_COMMAND} -E make_directory $/assets/symbols # COMMAND ${VS_COPY_ASSETS_CMD} )