diff --git a/mk/windows/build-zg+deps-2015-32.bat b/mk/windows/build-zg+deps-2015-32.bat index 7cc0c0e97..7e6b5c860 100644 --- a/mk/windows/build-zg+deps-2015-32.bat +++ b/mk/windows/build-zg+deps-2015-32.bat @@ -2,4 +2,4 @@ Echo Compiling for 32-bit using Visual Studio 2015... SET VCVARS_PLATFORM=amd64_x86 SET FOLDER_NAME=vs2015-32 -call .\build-zg.bat 2015-32 deps \ No newline at end of file +call .\build-zg.bat 2015-32 deps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg+deps-2015-64.bat b/mk/windows/build-zg+deps-2015-64.bat index 247e19e0f..b4d17db5b 100644 --- a/mk/windows/build-zg+deps-2015-64.bat +++ b/mk/windows/build-zg+deps-2015-64.bat @@ -2,4 +2,4 @@ Echo Compiling for 64-bit using Visual Studio 2015... SET VCVARS_PLATFORM=amd64 SET FOLDER_NAME=vs2015-64 -call .\build-zg.bat 2015-64 deps \ No newline at end of file +call .\build-zg.bat 2015-64 deps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg+deps-2017-32.bat b/mk/windows/build-zg+deps-2017-32.bat index e9b92828d..7c5f3521e 100644 --- a/mk/windows/build-zg+deps-2017-32.bat +++ b/mk/windows/build-zg+deps-2017-32.bat @@ -2,4 +2,4 @@ Echo Compiling for 32-bit using Visual Studio 2017... SET VCVARS_PLATFORM=amd64_x86 SET FOLDER_NAME=vs2017-32 -call .\build-zg.bat 2017-32 deps \ No newline at end of file +call .\build-zg.bat 2017-32 deps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg+deps-2017-64.bat b/mk/windows/build-zg+deps-2017-64.bat index 0c039694b..1dba83afa 100644 --- a/mk/windows/build-zg+deps-2017-64.bat +++ b/mk/windows/build-zg+deps-2017-64.bat @@ -2,4 +2,4 @@ Echo Compiling for 64-bit using Visual Studio 2017... SET VCVARS_PLATFORM=amd64 SET FOLDER_NAME=vs2017-64 -call .\build-zg.bat 2017-64 deps \ No newline at end of file +call .\build-zg.bat 2017-64 deps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg-2015-32.bat b/mk/windows/build-zg-2015-32.bat index 884c4a28a..f5e0d1dcb 100644 --- a/mk/windows/build-zg-2015-32.bat +++ b/mk/windows/build-zg-2015-32.bat @@ -2,4 +2,4 @@ Echo Compiling for 32-bit using Visual Studio 2015... SET VCVARS_PLATFORM=amd64_x86 SET FOLDER_NAME=vs2015-32 -call .\build-zg.bat 2015-32 nodeps \ No newline at end of file +call .\build-zg.bat 2015-32 nodeps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg-2015-64.bat b/mk/windows/build-zg-2015-64.bat index 342d0d72e..a1a444db7 100644 --- a/mk/windows/build-zg-2015-64.bat +++ b/mk/windows/build-zg-2015-64.bat @@ -2,4 +2,4 @@ Echo Compiling for 64-bit using Visual Studio 2015... SET VCVARS_PLATFORM=amd64 SET FOLDER_NAME=vs2015-64 -call .\build-zg.bat 2015-64 nodeps \ No newline at end of file +call .\build-zg.bat 2015-64 nodeps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg-2017-32.bat b/mk/windows/build-zg-2017-32.bat index 412a56714..3bd389023 100644 --- a/mk/windows/build-zg-2017-32.bat +++ b/mk/windows/build-zg-2017-32.bat @@ -2,4 +2,4 @@ Echo Compiling for 32-bit using Visual Studio 2017... SET VCVARS_PLATFORM=amd64_x86 SET FOLDER_NAME=vs2017-32 -call .\build-zg.bat 2017-32 nodeps \ No newline at end of file +call .\build-zg.bat 2017-32 nodeps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg-2017-64.bat b/mk/windows/build-zg-2017-64.bat index 68781ac2c..5119595b8 100644 --- a/mk/windows/build-zg-2017-64.bat +++ b/mk/windows/build-zg-2017-64.bat @@ -2,4 +2,4 @@ Echo Compiling for 64-bit using Visual Studio 2017... SET VCVARS_PLATFORM=amd64 SET FOLDER_NAME=vs2017-64 -call .\build-zg.bat 2017-64 nodeps \ No newline at end of file +call .\build-zg.bat 2017-64 nodeps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg.bat b/mk/windows/build-zg.bat index 27dd72fe5..0c8d7b203 100644 --- a/mk/windows/build-zg.bat +++ b/mk/windows/build-zg.bat @@ -171,4 +171,5 @@ ECHO. ECHO If build was successful, then output is in bin folder, otherwise scroll up a little to view error messages. ECHO Thanks for trying out ZetaGlest. ECHO. -pause \ No newline at end of file + +if NOT "%~3"=="nopause" pause \ No newline at end of file diff --git a/mk/windows/prep-for-release.bat b/mk/windows/prep-for-release.bat index 7fa9e4791..364e7c2ec 100644 --- a/mk/windows/prep-for-release.bat +++ b/mk/windows/prep-for-release.bat @@ -1,3 +1,12 @@ @echo off +call build-zg+deps-2015-32.bat nopause +call build-zg+deps-2015-64.bat nopause +call build-zg+deps-2017-32.bat nopause +call build-zg+deps-2017-64.bat nopause +Echo Replacing glest.ini with glest_release.ini... copy /y glest_release.ini bin\vs2015\glest.ini -copy /y glest_release.ini bin\vs2017\glest.ini \ No newline at end of file +copy /y glest_release.ini bin\vs2017\glest.ini +Echo. +ECHO ...and done +Echo. +if NOT "%~1"=="nopause" pause \ No newline at end of file