From 2b336b9f2fdb3f1f6e48f3860e723f8a2c6301a0 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Tue, 4 Dec 2018 00:57:28 -0500
Subject: [PATCH] Move DLL binaries from bin/Resources to libs/dll-binaries

Reason for this is because the SDL2 binaries live in libs/ for ease of copying. The DLLs ought to be in one location.
---
 bin/Resources/windows-dll-list.txt            |  45 ------------------
 libs/DLL-README.txt                           |  43 +++++++++++++++++
 .../dll-binaries}/i686/Old/fmod.dll           | Bin
 .../dll-binaries}/i686/Old/fmodexL.dll        | Bin
 .../dll-binaries}/i686/Old/libgcc_s_dw2-1.dll | Bin
 .../dll-binaries}/i686/Old/libintl-8.dll      | Bin
 .../dll-binaries}/i686/exchndl.dll            | Bin
 .../dll-binaries}/i686/fmodex.dll             | Bin
 .../dll-binaries}/i686/libgme.dll             | Bin
 .../dll-binaries}/i686/mgwhelp.dll            | Bin
 .../dll-binaries}/x86_64/Old/fmod64.dll       | Bin
 .../dll-binaries}/x86_64/Old/fmodexL64.dll    | Bin
 .../dll-binaries}/x86_64/exchndl.dll          | Bin
 .../dll-binaries}/x86_64/fmodex64.dll         | Bin
 .../dll-binaries}/x86_64/libgme.dll           | Bin
 .../dll-binaries}/x86_64/mgwhelp.dll          | Bin
 16 files changed, 43 insertions(+), 45 deletions(-)
 delete mode 100644 bin/Resources/windows-dll-list.txt
 create mode 100644 libs/DLL-README.txt
 rename {bin/Resources => libs/dll-binaries}/i686/Old/fmod.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/i686/Old/fmodexL.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/i686/Old/libgcc_s_dw2-1.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/i686/Old/libintl-8.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/i686/exchndl.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/i686/fmodex.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/i686/libgme.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/i686/mgwhelp.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/x86_64/Old/fmod64.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/x86_64/Old/fmodexL64.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/x86_64/exchndl.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/x86_64/fmodex64.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/x86_64/libgme.dll (100%)
 rename {bin/Resources => libs/dll-binaries}/x86_64/mgwhelp.dll (100%)

diff --git a/bin/Resources/windows-dll-list.txt b/bin/Resources/windows-dll-list.txt
deleted file mode 100644
index cd8a84a89..000000000
--- a/bin/Resources/windows-dll-list.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-# SRB2 - Which DLLs do I need to bundle?
-
-Updated 12/4/2018 (v2.1.21)
-
-Most required DLL binaries are in the libs\ folder. The binaries that are NOT there are living in bin\Resources.
-
-Here are the required DLLs, per build. For each architecture, copy all the binaries from these folders:
-
-* bin\Resources\[i686/x86_64]
-* libs\SDL2\[i686/x86_64]...\bin
-* libs\SDL2_mixer\[i686/x86_64]...\bin
-
-and don't forget to build r_opengl.dll for srb2dd.
-
-## srb2win, 32-bit
-
-* bin\Resources\i686\exchndl.dll
-* bin\Resources\i686\libgme.dll
-* bin\Resources\i686\mgwhelp.dll (depend for exchndl.dll)
-* libs\SDL2\i686-w64-mingw32\bin\SDL2.dll
-* libs\SDL2_mixer\i686-w64-mingw32\bin\*.dll (get everything)
-
-## srb2win, 64-bit
-
-* bin\Resources\x86_64\exchndl.dll
-* bin\Resources\x86_64\libgme.dll
-* bin\Resources\x86_64\mgwhelp.dll (depend for exchndl.dll)
-* libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll
-* libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything)
-
-## srb2dd, 32-bit
-
-* bin\Resources\i686\exchndl.dll
-* bin\Resources\i686\fmodex.dll
-* bin\Resources\i686\libgme.dll
-* bin\Resources\i686\mgwhelp.dll (depend for exchndl.dll)
-* r_opengl.dll (build this from make)
-
-## srb2dd, 64-bit
-
-* bin\Resources\x86_64\exchndl.dll
-* bin\Resources\x86_64\fmodex.dll
-* bin\Resources\x86_64\libgme.dll
-* bin\Resources\x86_64\mgwhelp.dll (depend for exchndl.dll)
-* r_opengl.dll (build this from make)
diff --git a/libs/DLL-README.txt b/libs/DLL-README.txt
new file mode 100644
index 000000000..058ec0685
--- /dev/null
+++ b/libs/DLL-README.txt
@@ -0,0 +1,43 @@
+# SRB2 - Which DLLs do I need to bundle?
+
+Updated 12/4/2018 (v2.1.21)
+
+Here are the required DLLs, per build. For each architecture, copy all the binaries from these folders:
+
+* libs\dll-binaries\[i686/x86_64]
+* libs\SDL2\[i686/x86_64]...\bin
+* libs\SDL2_mixer\[i686/x86_64]...\bin
+
+and don't forget to build r_opengl.dll for srb2dd.
+
+## srb2win, 32-bit
+
+* libs\dll-binaries\i686\exchndl.dll
+* libs\dll-binaries\i686\libgme.dll
+* libs\dll-binaries\i686\mgwhelp.dll (depend for exchndl.dll)
+* libs\SDL2\i686-w64-mingw32\bin\SDL2.dll
+* libs\SDL2_mixer\i686-w64-mingw32\bin\*.dll (get everything)
+
+## srb2win, 64-bit
+
+* libs\dll-binaries\x86_64\exchndl.dll
+* libs\dll-binaries\x86_64\libgme.dll
+* libs\dll-binaries\x86_64\mgwhelp.dll (depend for exchndl.dll)
+* libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll
+* libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything)
+
+## srb2dd, 32-bit
+
+* libs\dll-binaries\i686\exchndl.dll
+* libs\dll-binaries\i686\fmodex.dll
+* libs\dll-binaries\i686\libgme.dll
+* libs\dll-binaries\i686\mgwhelp.dll (depend for exchndl.dll)
+* r_opengl.dll (build this from make)
+
+## srb2dd, 64-bit
+
+* libs\dll-binaries\x86_64\exchndl.dll
+* libs\dll-binaries\x86_64\fmodex.dll
+* libs\dll-binaries\x86_64\libgme.dll
+* libs\dll-binaries\x86_64\mgwhelp.dll (depend for exchndl.dll)
+* r_opengl.dll (build this from make)
diff --git a/bin/Resources/i686/Old/fmod.dll b/libs/dll-binaries/i686/Old/fmod.dll
similarity index 100%
rename from bin/Resources/i686/Old/fmod.dll
rename to libs/dll-binaries/i686/Old/fmod.dll
diff --git a/bin/Resources/i686/Old/fmodexL.dll b/libs/dll-binaries/i686/Old/fmodexL.dll
similarity index 100%
rename from bin/Resources/i686/Old/fmodexL.dll
rename to libs/dll-binaries/i686/Old/fmodexL.dll
diff --git a/bin/Resources/i686/Old/libgcc_s_dw2-1.dll b/libs/dll-binaries/i686/Old/libgcc_s_dw2-1.dll
similarity index 100%
rename from bin/Resources/i686/Old/libgcc_s_dw2-1.dll
rename to libs/dll-binaries/i686/Old/libgcc_s_dw2-1.dll
diff --git a/bin/Resources/i686/Old/libintl-8.dll b/libs/dll-binaries/i686/Old/libintl-8.dll
similarity index 100%
rename from bin/Resources/i686/Old/libintl-8.dll
rename to libs/dll-binaries/i686/Old/libintl-8.dll
diff --git a/bin/Resources/i686/exchndl.dll b/libs/dll-binaries/i686/exchndl.dll
similarity index 100%
rename from bin/Resources/i686/exchndl.dll
rename to libs/dll-binaries/i686/exchndl.dll
diff --git a/bin/Resources/i686/fmodex.dll b/libs/dll-binaries/i686/fmodex.dll
similarity index 100%
rename from bin/Resources/i686/fmodex.dll
rename to libs/dll-binaries/i686/fmodex.dll
diff --git a/bin/Resources/i686/libgme.dll b/libs/dll-binaries/i686/libgme.dll
similarity index 100%
rename from bin/Resources/i686/libgme.dll
rename to libs/dll-binaries/i686/libgme.dll
diff --git a/bin/Resources/i686/mgwhelp.dll b/libs/dll-binaries/i686/mgwhelp.dll
similarity index 100%
rename from bin/Resources/i686/mgwhelp.dll
rename to libs/dll-binaries/i686/mgwhelp.dll
diff --git a/bin/Resources/x86_64/Old/fmod64.dll b/libs/dll-binaries/x86_64/Old/fmod64.dll
similarity index 100%
rename from bin/Resources/x86_64/Old/fmod64.dll
rename to libs/dll-binaries/x86_64/Old/fmod64.dll
diff --git a/bin/Resources/x86_64/Old/fmodexL64.dll b/libs/dll-binaries/x86_64/Old/fmodexL64.dll
similarity index 100%
rename from bin/Resources/x86_64/Old/fmodexL64.dll
rename to libs/dll-binaries/x86_64/Old/fmodexL64.dll
diff --git a/bin/Resources/x86_64/exchndl.dll b/libs/dll-binaries/x86_64/exchndl.dll
similarity index 100%
rename from bin/Resources/x86_64/exchndl.dll
rename to libs/dll-binaries/x86_64/exchndl.dll
diff --git a/bin/Resources/x86_64/fmodex64.dll b/libs/dll-binaries/x86_64/fmodex64.dll
similarity index 100%
rename from bin/Resources/x86_64/fmodex64.dll
rename to libs/dll-binaries/x86_64/fmodex64.dll
diff --git a/bin/Resources/x86_64/libgme.dll b/libs/dll-binaries/x86_64/libgme.dll
similarity index 100%
rename from bin/Resources/x86_64/libgme.dll
rename to libs/dll-binaries/x86_64/libgme.dll
diff --git a/bin/Resources/x86_64/mgwhelp.dll b/libs/dll-binaries/x86_64/mgwhelp.dll
similarity index 100%
rename from bin/Resources/x86_64/mgwhelp.dll
rename to libs/dll-binaries/x86_64/mgwhelp.dll
-- 
GitLab