From ab1c05023fe077b8bdffdec38d932ff512863846 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sat, 4 May 2024 18:01:11 -0700
Subject: [PATCH] Update/minor cleanup dist scripts

---
 Dist/Package.sh                   | 8 ++++----
 Dist/QuickTestBuildAndPackage.bat | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Dist/Package.sh b/Dist/Package.sh
index 5428527a11..97d75e935d 100755
--- a/Dist/Package.sh
+++ b/Dist/Package.sh
@@ -5,18 +5,18 @@ cd "$(dirname "$0")/.."
 rm -fr "$targetDir" && mkdir -p "$targetDir"
 find "output" -type f \( -wholename "output/EmuHawk.exe" -o -wholename "output/DiscoHawk.exe" -o -wholename "output/*.config" -o -wholename "output/defctrl.json" -o -wholename "output/EmuHawkMono.sh" -o -wholename "output/dll/*" -o -wholename "output/Shaders/*" -o -wholename "output/gamedb/*" -o -wholename "output/Tools/*" -o -wholename "output/NES/Palettes/*" -o -wholename "output/Lua/*" -o -wholename "output/Gameboy/Palettes/*" -o -wholename "output/overlay/*" \) \
 	-not -name "*.pdb" -not -name "*.lib" -not -name "*.pgd" -not -name "*.ipdb" -not -name "*.iobj" -not -name "*.exp" -not -name "*.ilk" \
-	-not -wholename "output/dll/*.xml" -not -wholename "output/dll/libsneshawk-64*.exe" -not -wholename "output/dll/gpgx.elf" -not -wholename "output/dll/miniclient.*" \
+	-not -wholename "output/dll/*.xml" \
 	-exec install -D -m644 "{}" "packaged_{}" \;
 cd "$targetDir"
 if [ "$1" = "windows-x64" ]; then
 	rm -f "EmuHawkMono.sh"
 	cd "dll"
-	rm -f "libe_sqlite3.so" "libSDL2.so" "OpenTK.dll.config" \
+	rm -f "libchd_capi.so" "libe_sqlite3.so" "libSDL2.so" "OpenTK.dll.config" \
 		"libbizlynx.dll.so" "libbizswan.dll.so" "libblip_buf.so" "libbizhash.so" "libdarm.so" "libemu83.so" "libencore.so" "libfwunpack.so" "libgambatte.so" "libLibretroBridge.so" "libquicknes.so" "librcheevos.so" "libsameboy.so" "libmgba.dll.so" "libMSXHawk.so" "libwaterboxhost.so"
 else
 	find . -type f -name "*.sh" -exec chmod +x {} \; # installed with -m644 but needs to be 755
 	cd "dll"
-	rm -f "e_sqlite3.dll" "lua54.dll" "SDL.dll" "SDL2.dll" \
+	rm -f "chd_capi.dll" "e_sqlite3.dll" "lua54.dll" "SDL2.dll" \
 		"mupen64plus-audio-bkm.dll" "mupen64plus-input-bkm.dll" "mupen64plus-rsp-cxd4-sse2.dll" "mupen64plus-rsp-hle.dll" "mupen64plus-video-angrylion-rdp.dll" "mupen64plus-video-glide64.dll" "mupen64plus-video-glide64mk2.dll" "mupen64plus-video-GLideN64.dll" "mupen64plus-video-rice.dll" "mupen64plus.dll" "octoshock.dll" \
-		"bizlynx.dll" "bizswan.dll" "blip_buf.dll" "libbizhash.dll" "libdarm.dll" "libemu83.dll" "libfwunpack.dll" "libgambatte.dll" "libLibretroBridge.dll" "libquicknes.dll" "librcheevos.dll" "libsameboy.dll" "mgba.dll" "MSXHawk.dll" "waterboxhost.dll" "encore.dll"
+		"bizlynx.dll" "bizswan.dll" "blip_buf.dll" "libbizhash.dll" "libdarm.dll" "libemu83.dll" "encore.dll" "libfwunpack.dll" "libgambatte.dll" "libLibretroBridge.dll" "libquicknes.dll" "librcheevos.dll" "libsameboy.dll" "mgba.dll" "MSXHawk.dll" "waterboxhost.dll"
 fi
diff --git a/Dist/QuickTestBuildAndPackage.bat b/Dist/QuickTestBuildAndPackage.bat
index 1ce3af0920..91eaedcd7e 100644
--- a/Dist/QuickTestBuildAndPackage.bat
+++ b/Dist/QuickTestBuildAndPackage.bat
@@ -18,11 +18,8 @@ rmdir /s /q temp
 del /s %NAME%
 cd ..\output
 
-rem slimdx has a way of not making it into the output directory, so this is a good time to make sure
-copy ..\..\SlimDx.dll
-
 rem Now, we're about to zip and then unzip. Why, you ask? Because that's just the way this evolved.
-..\dist\zip.exe -X -r ..\Dist\%NAME% EmuHawk.exe EmuHawk.exe.config DiscoHawk.exe DiscoHawk.exe.config defctrl.json EmuHawkMono.sh dll Shaders gamedb Tools NES\Palettes Lua Gameboy\Palettes overlay -x *.pdb -x *.lib -x *.pgd -x *.ipdb -x *.iobj -x *.exp -x dll\libsneshawk-64*.exe -x *.ilk -x dll\gpgx.elf -x dll\miniclient.*
+..\dist\zip.exe -X -r ..\Dist\%NAME% EmuHawk.exe EmuHawk.exe.config DiscoHawk.exe DiscoHawk.exe.config defctrl.json EmuHawkMono.sh dll Shaders gamedb Tools NES\Palettes Lua Gameboy\Palettes overlay -x *.pdb -x *.lib -x *.pgd -x *.ipdb -x *.iobj -x *.exp -x *.ilk
 
 cd ..\Dist
 .\unzip.exe %NAME% -d temp