From a41a5ddf33053cd81ec85e0e47de84d80b68dca5 Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Fri, 20 Jun 2025 19:31:58 -0400
Subject: [PATCH] Fix extractor?

---
 scripts/linux/appimage/soh.sh.in |  2 +-
 soh/CMakeLists.txt               | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/linux/appimage/soh.sh.in b/scripts/linux/appimage/soh.sh.in
index e02b44fc7..dddb0a3c9 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/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1
+                    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
                     cp "$ASSETDIR"/"$OTRNAME" "$SHIP_HOME"
                 fi
             else
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index dd29b1417..843e016b2 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -609,17 +609,22 @@ endif()
 # Pre build events
 ################################################################################
 if (CMAKE_GENERATOR MATCHES "Visual Studio")
-	set(VS_COPY_ASSETS_CMD ${CMAKE_COMMAND} -E copy_directory_if_different $<TARGET_FILE_DIR:soh>/assets ${CMAKE_BINARY_DIR}/soh/assets)
+	add_custom_command(
+    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
+    )
 endif()
 if(NOT CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS")
     add_custom_command(
 		TARGET ${PROJECT_NAME}
 		POST_BUILD
 		COMMENT "Copying asset xmls..."
-        COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor $<TARGET_FILE_DIR:soh>/assets/extractor
-		COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $<TARGET_FILE_DIR:soh>/assets/extractor/xmls
-        COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:soh>/assets/extractor/symbols
-		COMMAND ${VS_COPY_ASSETS_CMD}
+        COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/extractor $<TARGET_FILE_DIR:soh>/assets
+		COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${CMAKE_SOURCE_DIR}/soh/assets/xml $<TARGET_FILE_DIR:soh>/assets/xmls
+        COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:soh>/assets/symbols
+	#	COMMAND ${VS_COPY_ASSETS_CMD}
     )
 endif()
 ################################################################################