mirror of
https://github.com/glest/glest-source.git
synced 2025-09-03 04:52:34 +02:00
Changed Map Editor from MG to ZG and improved build on Windows
This commit is contained in:
5
mk/windows/build-zg+deps-2015-32.bat
Normal file
5
mk/windows/build-zg+deps-2015-32.bat
Normal 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
|
5
mk/windows/build-zg+deps-2015-64.bat
Normal file
5
mk/windows/build-zg+deps-2015-64.bat
Normal 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
|
5
mk/windows/build-zg+deps-2017-32.bat
Normal file
5
mk/windows/build-zg+deps-2017-32.bat
Normal 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
|
5
mk/windows/build-zg+deps-2017-64.bat
Normal file
5
mk/windows/build-zg+deps-2017-64.bat
Normal 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
|
@@ -2,4 +2,4 @@
|
|||||||
Echo Compiling for 32-bit using Visual Studio 2015...
|
Echo Compiling for 32-bit using Visual Studio 2015...
|
||||||
SET VCVARS_PLATFORM=amd64_x86
|
SET VCVARS_PLATFORM=amd64_x86
|
||||||
SET FOLDER_NAME=vs2015-32
|
SET FOLDER_NAME=vs2015-32
|
||||||
call .\build-zg.bat 2015-32
|
call .\build-zg.bat 2015-32 nodeps
|
@@ -2,4 +2,4 @@
|
|||||||
Echo Compiling for 64-bit using Visual Studio 2015...
|
Echo Compiling for 64-bit using Visual Studio 2015...
|
||||||
SET VCVARS_PLATFORM=amd64
|
SET VCVARS_PLATFORM=amd64
|
||||||
SET FOLDER_NAME=vs2015-64
|
SET FOLDER_NAME=vs2015-64
|
||||||
call .\build-zg.bat 2015-64
|
call .\build-zg.bat 2015-64 nodeps
|
@@ -2,4 +2,4 @@
|
|||||||
Echo Compiling for 32-bit using Visual Studio 2017...
|
Echo Compiling for 32-bit using Visual Studio 2017...
|
||||||
SET VCVARS_PLATFORM=amd64_x86
|
SET VCVARS_PLATFORM=amd64_x86
|
||||||
SET FOLDER_NAME=vs2017-32
|
SET FOLDER_NAME=vs2017-32
|
||||||
call .\build-zg.bat 2017-32
|
call .\build-zg.bat 2017-32 nodeps
|
@@ -2,4 +2,4 @@
|
|||||||
Echo Compiling for 64-bit using Visual Studio 2017...
|
Echo Compiling for 64-bit using Visual Studio 2017...
|
||||||
SET VCVARS_PLATFORM=amd64
|
SET VCVARS_PLATFORM=amd64
|
||||||
SET FOLDER_NAME=vs2017-64
|
SET FOLDER_NAME=vs2017-64
|
||||||
call .\build-zg.bat 2017-64
|
call .\build-zg.bat 2017-64 nodeps
|
@@ -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%"=="Y" GOTO SIXTYFOUR
|
IF /I "%PLATFORM_SELECT%"=="Y" GOTO SIXTYFOUR
|
||||||
IF /I "%PLATFORM_SELECT%"=="" GOTO SIXTYFOUR
|
IF /I "%PLATFORM_SELECT%"=="" GOTO SIXTYFOUR
|
||||||
|
GOTO THIRTYTWO
|
||||||
|
|
||||||
:THIRTYTWO
|
:THIRTYTWO
|
||||||
SET VCVARS_PLATFORM=amd64_x86
|
SET VCVARS_PLATFORM=amd64_x86
|
||||||
@@ -44,14 +45,23 @@ IF /I "%QUERY%" NEQ "1" (
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
GOTO START
|
GOTO CHECKDEPS
|
||||||
|
|
||||||
:SETENV
|
:SETENV
|
||||||
SET TEMPLOL=%~1
|
SET TEMPLOL=%~1
|
||||||
call .\set-env-%TEMPLOL:~0,4%.bat
|
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 --------------------------------
|
||||||
Echo Compiling dependencies (this will take a long time)...
|
Echo Compiling dependencies (this will take a long time)...
|
||||||
|
|
||||||
@@ -144,6 +154,9 @@ cd ..\..\..
|
|||||||
|
|
||||||
cd ..\..
|
cd ..\..
|
||||||
|
|
||||||
|
GOTO COMPILEZG
|
||||||
|
|
||||||
|
:COMPILEZG
|
||||||
ECHO --------------------------------
|
ECHO --------------------------------
|
||||||
Echo Building ZetaGlest...
|
Echo Building ZetaGlest...
|
||||||
cd .\%FOLDER_NAME%\
|
cd .\%FOLDER_NAME%\
|
||||||
|
@@ -1,3 +1,3 @@
|
|||||||
@echo off
|
@echo off
|
||||||
.\clone-deps.bat
|
call .\clone-deps.bat
|
||||||
.\build-zg.bat
|
call .\build-zg.bat
|
@@ -59,7 +59,7 @@ string getGameReadWritePath(const string &lookupKey) {
|
|||||||
namespace MapEditor {
|
namespace MapEditor {
|
||||||
|
|
||||||
const string mapeditorVersionString = "v0.8.01";
|
const string mapeditorVersionString = "v0.8.01";
|
||||||
const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString;
|
const string MainWindow::winHeader = "ZetaGlest Map Editor " + mapeditorVersionString;
|
||||||
|
|
||||||
// ===============================================
|
// ===============================================
|
||||||
// class Global functions
|
// class Global functions
|
||||||
@@ -1655,7 +1655,7 @@ bool App::OnInit() {
|
|||||||
string fileparam;
|
string fileparam;
|
||||||
if(argc==2){
|
if(argc==2){
|
||||||
if(argv[1][0]=='-') { // any flag gives help and exits program.
|
if(argv[1][0]=='-') { // any flag gives help and exits program.
|
||||||
std::cout << std::endl << "MegaGlest map editor " << mapeditorVersionString << " [Using " << (const char *)wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl;
|
std::cout << std::endl << "ZetaGlest map editor " << mapeditorVersionString << " [Using " << (const char *)wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl;
|
||||||
//std::cout << "\nglest_map_editor [MGM FILE]" << std::endl << std::endl;
|
//std::cout << "\nglest_map_editor [MGM FILE]" << std::endl << std::endl;
|
||||||
std::cout << "Creates or edits megaglest/glest maps. [.mgm/.gbm]" << std::endl << std::endl;
|
std::cout << "Creates or edits megaglest/glest maps. [.mgm/.gbm]" << std::endl << std::endl;
|
||||||
std::cout << "Draw with left mouse button." << std::endl;
|
std::cout << "Draw with left mouse button." << std::endl;
|
||||||
|
Reference in New Issue
Block a user