Changed Map Editor from MG to ZG and improved build on Windows

This commit is contained in:
mathusummut
2018-04-29 02:18:05 +02:00
parent aada3eeebf
commit 724be4ead5
11 changed files with 44 additions and 11 deletions

View File

@@ -0,0 +1,5 @@
@echo off
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

View File

@@ -0,0 +1,5 @@
@echo off
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

View File

@@ -0,0 +1,5 @@
@echo off
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

View File

@@ -0,0 +1,5 @@
@echo off
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

View File

@@ -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
call .\build-zg.bat 2015-32 nodeps

View File

@@ -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
call .\build-zg.bat 2015-64 nodeps

View File

@@ -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
call .\build-zg.bat 2017-32 nodeps

View File

@@ -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
call .\build-zg.bat 2017-64 nodeps

View File

@@ -5,6 +5,7 @@ SET /P PLATFORM_SELECT=Compile ZetaGlest for 64-bit Windows ('n' for 32-bit)? ([
IF /I "%PLATFORM_SELECT%"=="y" GOTO SIXTYFOUR
IF /I "%PLATFORM_SELECT%"=="Y" GOTO SIXTYFOUR
IF /I "%PLATFORM_SELECT%"=="" GOTO SIXTYFOUR
GOTO THIRTYTWO
:THIRTYTWO
SET VCVARS_PLATFORM=amd64_x86
@@ -44,14 +45,23 @@ IF /I "%QUERY%" NEQ "1" (
)
)
GOTO START
GOTO CHECKDEPS
:SETENV
SET TEMPLOL=%~1
call .\set-env-%TEMPLOL:~0,4%.bat
GOTO START
GOTO CHECKDEPS
:START
:CHECKDEPS
if "%~2"=="deps" GOTO COMPILEDEPS
if "%~2"=="nodeps" GOTO COMPILEZG
Echo.
SET /P BUILD_DEPS=Compile dependencies as well? If first time, choose 'y' ([y]/n):
IF /I "%BUILD_DEPS%"=="n" GOTO COMPILEZG
IF /I "%BUILD_DEPS%"=="N" GOTO COMPILEZG
GOTO COMPILEDEPS
:COMPILEDEPS
ECHO --------------------------------
Echo Compiling dependencies (this will take a long time)...
@@ -144,6 +154,9 @@ cd ..\..\..
cd ..\..
GOTO COMPILEZG
:COMPILEZG
ECHO --------------------------------
Echo Building ZetaGlest...
cd .\%FOLDER_NAME%\

View File

@@ -1,3 +1,3 @@
@echo off
.\clone-deps.bat
.\build-zg.bat
call .\clone-deps.bat
call .\build-zg.bat