From c26b3c35e3bacd07e8ce8af76b8b151089e7a587 Mon Sep 17 00:00:00 2001
From: mathusummut <mathusum.mut@gmail.com>
Date: Mon, 7 May 2018 23:48:53 +0200
Subject: [PATCH] Windows build now groups binaries into /mk/windows/bin folder

---
 .gitignore                    |  1 +
 mk/windows/build-zg.bat       |  4 ++++
 mk/windows/clean-all.bat      |  6 ++++++
 mk/windows/clean-zg.bat       |  6 ++++++
 mk/windows/group-binaries.bat | 37 +++++++++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 mk/windows/group-binaries.bat

diff --git a/.gitignore b/.gitignore
index 5aa496774..237448e63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,6 +93,7 @@ $RECYCLE.BIN/
 unsuccessfulbuild
 /mk/windows/dependencies/openssl
 /mk/windows/dependencies/src
+/mk/windows/bin
 /data
 #
 /mk/linux/zetaglest
diff --git a/mk/windows/build-zg.bat b/mk/windows/build-zg.bat
index 46a0800e1..443c15a18 100644
--- a/mk/windows/build-zg.bat
+++ b/mk/windows/build-zg.bat
@@ -162,5 +162,9 @@ Echo Building ZetaGlest...
 cd .\%FOLDER_NAME%\
 msbuild.exe /p:Configuration=%MSBUILD_CONFIG%;Platform=%PLATFORM%;PlatformToolset=%TOOLSET% ZetaGlest.sln
 cd ..\
+ECHO.
+ECHO Copying binaries...
+ECHO.
+call .\group-binaries.bat
 ECHO ... Done.
 pause
\ No newline at end of file
diff --git a/mk/windows/clean-all.bat b/mk/windows/clean-all.bat
index 866e5b371..3147a121b 100644
--- a/mk/windows/clean-all.bat
+++ b/mk/windows/clean-all.bat
@@ -39,6 +39,12 @@ IF EXIST .\vs2017-64 (
 	cd ..\
 )
 
+IF EXIST .\bin (
+	cd .\bin
+	CALL :DELETE
+	cd ..\
+)
+
 ROBOCOPY . . /S /MOVE
 ROBOCOPY . . /S /MOVE
 ROBOCOPY . . /S /MOVE
diff --git a/mk/windows/clean-zg.bat b/mk/windows/clean-zg.bat
index 1125120fd..f07705a42 100644
--- a/mk/windows/clean-zg.bat
+++ b/mk/windows/clean-zg.bat
@@ -33,6 +33,12 @@ IF EXIST .\vs2017-64 (
 	cd ..\
 )
 
+IF EXIST .\bin (
+	cd .\bin
+	CALL :DELETE
+	cd ..\
+)
+
 ROBOCOPY . . /S /MOVE
 ROBOCOPY . . /S /MOVE
 ROBOCOPY . . /S /MOVE
diff --git a/mk/windows/group-binaries.bat b/mk/windows/group-binaries.bat
new file mode 100644
index 000000000..a6e6cf58a
--- /dev/null
+++ b/mk/windows/group-binaries.bat
@@ -0,0 +1,37 @@
+@echo off
+md bin
+md bin\vs2015
+md bin\vs2017
+
+copy /y 7z.dll bin\vs2015\7z.dll
+copy /y 7z.dll bin\vs2017\7z.dll
+
+copy /y 7z.exe bin\vs2015\7z.exe
+copy /y 7z.exe bin\vs2017\7z.exe
+
+copy /y glest.ini bin\vs2015\glest.ini
+copy /y glest.ini bin\vs2017\glest.ini
+
+copy /y ..\shared\glestkeys.ini bin\vs2015\glestkeys.ini
+copy /y ..\shared\glestkeys.ini bin\vs2017\glestkeys.ini
+
+copy /y ..\shared\servers.ini bin\vs2015\servers.ini
+copy /y ..\shared\servers.ini bin\vs2017\servers.ini
+
+copy /y vs2015-32\g3d_viewerWin32\Release\g3dviewer.exe bin\vs2015\g3dviewer-32.exe
+copy /y vs2017-32\g3d_viewerWin32\Release\g3dviewer.exe bin\vs2017\g3dviewer-32.exe
+
+copy /y vs2015-32\map_editorWin32\Release\map_editor.exe bin\vs2015\map_editor-32.exe
+copy /y vs2017-32\map_editorWin32\Release\map_editor.exe bin\vs2017\map_editor-32.exe
+
+copy /y vs2015-32\zetaglest\zetaglest.exe bin\vs2015\zetaglest-32.exe
+copy /y vs2017-32\zetaglest\zetaglest.exe bin\vs2017\zetaglest-32.exe
+
+copy /y vs2015-64\g3dviewerx64\Release\g3dviewer.exe bin\vs2015\g3dviewer-64.exe
+copy /y vs2017-64\g3dviewerx64\Release\g3dviewer.exe bin\vs2017\g3dviewer-64.exe
+
+copy /y vs2015-64\map_editorx64\Release\map_editor.exe bin\vs2015\map_editor-64.exe
+copy /y vs2017-64\map_editorx64\Release\map_editor.exe bin\vs2017\map_editor-64.exe
+
+copy /y vs2015-64\zetaglest\zetaglest.exe bin\vs2015\zetaglest-64.exe
+copy /y vs2017-64\zetaglest\zetaglest.exe bin\vs2017\zetaglest-64.exe
\ No newline at end of file