From ef6227d8be1830acb455365e269e0e14f0d0275f Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Tue, 13 Jun 2023 09:29:36 -0400 Subject: fully remove OTRGui (#2982) * linux local debug working * built in extraction working on linux * try a thing * one more thing to try * try using dir * does this get the subdirectories? * component before pattern * loop i guess * maybe component was the issue? * zapd stuff i guess * maybe this * this feels promising * g != q * appimage is working, try fixing glfw issue on windows * don't copy zapd.exe * hopefully this gets the things we need in the assets dir * is that where those went? * try another thing * another thing to try * grasping at straws * cmake makes no sense sometimes * really just trying anything here now * this is what i was expecting to work * ls * try doing it without the cmake again * i think this might do the trick * try with a slash * one more thing to try * pal_oot.txt * maybe this makes things work on mac --------- Co-authored-by: briaguya --- scripts/linux/appimage/build.sh | 1 - scripts/linux/appimage/soh.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/linux') diff --git a/scripts/linux/appimage/build.sh b/scripts/linux/appimage/build.sh index 6a98b1924..86f46fb90 100755 --- a/scripts/linux/appimage/build.sh +++ b/scripts/linux/appimage/build.sh @@ -1,7 +1,6 @@ #!/bin/bash cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -cmake --build build-cmake --target OTRGui -- cmake --build build-cmake --config Release -- (cd build-cmake && cpack -G External) diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh index c9b7d2490..7abf3c8b7 100644 --- a/scripts/linux/appimage/soh.sh +++ b/scripts/linux/appimage/soh.sh @@ -18,7 +18,7 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do do if [[ -e $romfile ]]; then export ASSETDIR="$(mktemp -d /tmp/assets-XXXXX)" - ln -s "$HERE"/usr/bin/{assets,soh.elf,OTRGui} "$ASSETDIR" + ln -s "$HERE"/usr/bin/{assets,soh.elf,ZAPD} "$ASSETDIR" export OLDPWD="$PWD" mkdir -p "$ASSETDIR"/tmp mkdir -p "$ASSETDIR"/Extract -- cgit v1.2.3