From c9194bb97635248a0eefaa36964095cc77ae6b36 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Thu, 15 Mar 2018 16:07:21 +0100 Subject: [PATCH] Fixed glest.ini --- .gitignore | 2 ++ mk/windows/README.md | 2 -- mk/windows/clone-deps.bat | 4 +++- mk/windows/glest.ini | 18 +++++++++--------- mk/windows/vs2015-32/.gitignore | 4 +++- mk/windows/vs2015-32/g3d_viewer.vcxproj | 5 +++++ mk/windows/vs2015-32/glest_game.vcxproj | 17 +++++++++++++++++ mk/windows/vs2015-32/map_editor.vcxproj | 5 +++++ mk/windows/vs2015-64/.gitignore | 4 +++- mk/windows/vs2015-64/g3d_viewer.vcxproj | 5 +++++ mk/windows/vs2015-64/glest_game.vcxproj | 17 +++++++++++++++++ .../Release/libglest.tlog/unsuccessfulbuild | 0 mk/windows/vs2015-64/map_editor.vcxproj | 5 +++++ mk/windows/vs2017-32/.gitignore | 4 +++- mk/windows/vs2017-32/g3d_viewer.vcxproj | 5 +++++ mk/windows/vs2017-32/glest_game.vcxproj | 17 +++++++++++++++++ mk/windows/vs2017-32/map_editor.vcxproj | 5 +++++ mk/windows/vs2017-64/.gitignore | 4 +++- mk/windows/vs2017-64/g3d_viewer.vcxproj | 5 +++++ mk/windows/vs2017-64/glest_game.vcxproj | 17 +++++++++++++++++ mk/windows/vs2017-64/map_editor.vcxproj | 5 +++++ 21 files changed, 134 insertions(+), 16 deletions(-) delete mode 100644 mk/windows/vs2015-64/libglestx64_obj/Release/libglest.tlog/unsuccessfulbuild diff --git a/.gitignore b/.gitignore index e4fe66d9a..49b809c3e 100644 --- a/.gitignore +++ b/.gitignore @@ -89,8 +89,10 @@ $RECYCLE.BIN/ *.exe *.msi *.pdb +unsuccessfulbuild /mk/windows/dependencies/openssl /mk/windows/dependencies/src +/data # /mk/linux/zetaglest /mk/linux/zetaglest_editor diff --git a/mk/windows/README.md b/mk/windows/README.md index 32c2f2354..127391e61 100644 --- a/mk/windows/README.md +++ b/mk/windows/README.md @@ -9,8 +9,6 @@ To build ZetaGlest for the first time: 4. Run `build-zg.bat` in `/mk/windows`. 5. The built binaries will be found in the corresponding Visual Studio version and platform selected in `/mk/windows`. -To be able to run `zetaglest.exe`, make sure that in the same folder as the executable there are the contents of the [zetaglest-data repository](https://github.com/ZetaGlest/zetaglest-data). - Configuration in Visual Studio must be left as "Release", otherwise it won't compile, but one can still use debugging options by making the following changes in the project properties: Debug: diff --git a/mk/windows/clone-deps.bat b/mk/windows/clone-deps.bat index 0d168c002..a44cbaa57 100644 --- a/mk/windows/clone-deps.bat +++ b/mk/windows/clone-deps.bat @@ -1,6 +1,6 @@ @echo off setlocal -echo This will re-clone all dependencies from the corresponding GitHub repositories. +echo This will clone all dependencies from the corresponding GitHub repositories. SET /P AREYOUSURE=Are you sure you want to do this? (y/[n]) IF /I "%AREYOUSURE%" NEQ "y" GOTO END IF /I "%AREYOUSURE%" NEQ "Y" GOTO END @@ -42,6 +42,8 @@ git clone https://github.com/ZetaGlest/xerces-c.git dependencies/src/xerces Echo. git clone https://github.com/ZetaGlest/zlib.git dependencies/src/zlib Echo. +git clone https://github.com/ZetaGlest/zetaglest-data.git ..\..\data +Echo. :END endlocal \ No newline at end of file diff --git a/mk/windows/glest.ini b/mk/windows/glest.ini index f2a736027..f16f77a2a 100644 --- a/mk/windows/glest.ini +++ b/mk/windows/glest.ini @@ -19,7 +19,7 @@ ColorBits=32 ConsoleMaxLines=7 ConsoleMaxLinesStored=20 ConsoleTimeout=20 -DataPath=$APPLICATIONDATAPATH\ +DataPath=..\..\..\..\data LogPath=$APPDATA\zetaglest\ DayTime=1000 DebugLogFile=debug.log @@ -86,7 +86,7 @@ Textures3D=true TranslationGetURL=https://www.transifex.com/api/2/project/megaglest/resource/$file/translation/$language TranslationGetURLDetails=https://www.transifex.com/api/2/project/megaglest/resource/$file/?details TranslationGetURLFileList=main-language-file|megapack-language-file|loading-screen-hints|tutorials-1-very-basic-tutorial|tutorials-2-basic-tutorial|tutorials-3-advanced-tutorial|scenarios-amazones|scenarios-amazones-light|scenarios-capture-enemy-flag|scenarios-storming -TranslationGetURLFileListMapping=data/lang/$language.lng|techs/megapack/lang/megapack_$language.lng|data/lang/hint/hint_$language.lng|tutorials/1_very_basic_tutorial/1_very_basic_tutorial_$language.lng|tutorials/2_basic_tutorial/2_basic_tutorial_$language.lng|tutorials/3_advanced_tutorial/3_advanced_tutorial_$language.lng|scenarios/amazones/amazones_$language.lng|scenarios/amazones_light/amazones_light_$language.lng|scenarios/capture_enemy_flag/capture_enemy_flag_$language.lng|scenarios/storming/storming_$language.lng +TranslationGetURLFileListMapping=..\..\..\..\data\data\lang\$language.lng|..\..\..\..\data\data\lang\hint\hint_$language.lng|..\..\..\..\data\tutorials\1_very_basic_tutorial\1_very_basic_tutorial_$language.lng|..\..\..\..\data\tutorials\2_basic_tutorial\2_basic_tutorial_$language.lng|..\..\..\..\data\tutorials\3_advanced_tutorial\3_advanced_tutorial_$language.lng|..\..\..\..\data\scenarios\amazones\amazones_$language.lng|..\..\..\..\data\scenarios\amazones_light\amazones_light_$language.lng|..\..\..\..\data\scenarios\capture_enemy_flag\capture_enemy_flag_$language.lng|..\..\..\..\data\scenarios\storming\storming_$language.lng TranslationGetURLLanguage=en TranslationGetURLPassword= TranslationGetURLUser= @@ -101,13 +101,13 @@ Windowed=false ; ; FIXME: There should be a way to use the "DataPath" variable ; here (defined above) -PlaySoundAttention=data\core\menu\sound\attention.wav -PlaySoundHighlight=data\core\menu\sound\highlight.wav -PlaySoundNewServer=data\core\menu\sound\attention.wav -PlaySoundMarker=data\core\menu\sound\sonar.wav +PlaySoundAttention=..\..\..\..\data\data\core\menu\sound\attention.wav +PlaySoundHighlight=..\..\..\..\data\data\core\menu\sound\highlight.wav +PlaySoundNewServer=..\..\..\..\data\data\core\menu\sound\attention.wav +PlaySoundMarker=..\..\..\..\data\data\core\menu\sound\sonar.wav ; it's recommended that users not over-ride these. The sounds are just for ; menu clicks and should remain very short in duration. -PlaySoundMenuClickA=data\core\menu\sound\click_a.wav -PlaySoundMenuClickB=data\core\menu\sound\click_b.wav -PlaySoundMenuClickC=data\core\menu\sound\click_c.wav \ No newline at end of file +PlaySoundMenuClickA=..\..\..\..\data\data\core\menu\sound\click_a.wav +PlaySoundMenuClickB=..\..\..\..\data\data\core\menu\sound\click_b.wav +PlaySoundMenuClickC=..\..\..\..\data\data\core\menu\sound\click_c.wav \ No newline at end of file diff --git a/mk/windows/vs2015-32/.gitignore b/mk/windows/vs2015-32/.gitignore index b904358e2..18bbedb1a 100644 --- a/mk/windows/vs2015-32/.gitignore +++ b/mk/windows/vs2015-32/.gitignore @@ -15,4 +15,6 @@ *.lastbuildstate *.exp *.ipch -*.pch \ No newline at end of file +*.pch +*.ini +*.obj \ No newline at end of file diff --git a/mk/windows/vs2015-32/g3d_viewer.vcxproj b/mk/windows/vs2015-32/g3d_viewer.vcxproj index 3a338cdfb..47ee0d364 100644 --- a/mk/windows/vs2015-32/g3d_viewer.vcxproj +++ b/mk/windows/vs2015-32/g3d_viewer.vcxproj @@ -260,5 +260,10 @@ {8daa0c24-95cd-4f66-b4c5-19abdd771746} + + + PreserveNewest + + \ No newline at end of file diff --git a/mk/windows/vs2015-32/glest_game.vcxproj b/mk/windows/vs2015-32/glest_game.vcxproj index 73e0ef195..606b57ceb 100644 --- a/mk/windows/vs2015-32/glest_game.vcxproj +++ b/mk/windows/vs2015-32/glest_game.vcxproj @@ -755,6 +755,23 @@ + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-32/map_editor.vcxproj b/mk/windows/vs2015-32/map_editor.vcxproj index 85ab8fff3..3b5b545bd 100644 --- a/mk/windows/vs2015-32/map_editor.vcxproj +++ b/mk/windows/vs2015-32/map_editor.vcxproj @@ -249,6 +249,11 @@ + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-64/.gitignore b/mk/windows/vs2015-64/.gitignore index b904358e2..18bbedb1a 100644 --- a/mk/windows/vs2015-64/.gitignore +++ b/mk/windows/vs2015-64/.gitignore @@ -15,4 +15,6 @@ *.lastbuildstate *.exp *.ipch -*.pch \ No newline at end of file +*.pch +*.ini +*.obj \ No newline at end of file diff --git a/mk/windows/vs2015-64/g3d_viewer.vcxproj b/mk/windows/vs2015-64/g3d_viewer.vcxproj index fa87372d0..16aa6582f 100644 --- a/mk/windows/vs2015-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2015-64/g3d_viewer.vcxproj @@ -330,6 +330,11 @@ + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-64/glest_game.vcxproj b/mk/windows/vs2015-64/glest_game.vcxproj index 7024d6836..6b41f80b9 100644 --- a/mk/windows/vs2015-64/glest_game.vcxproj +++ b/mk/windows/vs2015-64/glest_game.vcxproj @@ -567,6 +567,23 @@ + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-64/libglestx64_obj/Release/libglest.tlog/unsuccessfulbuild b/mk/windows/vs2015-64/libglestx64_obj/Release/libglest.tlog/unsuccessfulbuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/mk/windows/vs2015-64/map_editor.vcxproj b/mk/windows/vs2015-64/map_editor.vcxproj index 43271e90d..96606b543 100644 --- a/mk/windows/vs2015-64/map_editor.vcxproj +++ b/mk/windows/vs2015-64/map_editor.vcxproj @@ -323,6 +323,11 @@ + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-32/.gitignore b/mk/windows/vs2017-32/.gitignore index b904358e2..18bbedb1a 100644 --- a/mk/windows/vs2017-32/.gitignore +++ b/mk/windows/vs2017-32/.gitignore @@ -15,4 +15,6 @@ *.lastbuildstate *.exp *.ipch -*.pch \ No newline at end of file +*.pch +*.ini +*.obj \ No newline at end of file diff --git a/mk/windows/vs2017-32/g3d_viewer.vcxproj b/mk/windows/vs2017-32/g3d_viewer.vcxproj index cadf0d440..8b8f17488 100644 --- a/mk/windows/vs2017-32/g3d_viewer.vcxproj +++ b/mk/windows/vs2017-32/g3d_viewer.vcxproj @@ -255,6 +255,11 @@ + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-32/glest_game.vcxproj b/mk/windows/vs2017-32/glest_game.vcxproj index edf5e918f..002e1dd00 100644 --- a/mk/windows/vs2017-32/glest_game.vcxproj +++ b/mk/windows/vs2017-32/glest_game.vcxproj @@ -755,6 +755,23 @@ + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-32/map_editor.vcxproj b/mk/windows/vs2017-32/map_editor.vcxproj index 4b168bfd0..d35ced090 100644 --- a/mk/windows/vs2017-32/map_editor.vcxproj +++ b/mk/windows/vs2017-32/map_editor.vcxproj @@ -249,6 +249,11 @@ + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-64/.gitignore b/mk/windows/vs2017-64/.gitignore index b904358e2..18bbedb1a 100644 --- a/mk/windows/vs2017-64/.gitignore +++ b/mk/windows/vs2017-64/.gitignore @@ -15,4 +15,6 @@ *.lastbuildstate *.exp *.ipch -*.pch \ No newline at end of file +*.pch +*.ini +*.obj \ No newline at end of file diff --git a/mk/windows/vs2017-64/g3d_viewer.vcxproj b/mk/windows/vs2017-64/g3d_viewer.vcxproj index 360bb9df5..a3d08020a 100644 --- a/mk/windows/vs2017-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2017-64/g3d_viewer.vcxproj @@ -330,6 +330,11 @@ + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-64/glest_game.vcxproj b/mk/windows/vs2017-64/glest_game.vcxproj index d58662a53..dddfa1a2f 100644 --- a/mk/windows/vs2017-64/glest_game.vcxproj +++ b/mk/windows/vs2017-64/glest_game.vcxproj @@ -567,6 +567,23 @@ + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-64/map_editor.vcxproj b/mk/windows/vs2017-64/map_editor.vcxproj index 87469aaf4..7ee8abb21 100644 --- a/mk/windows/vs2017-64/map_editor.vcxproj +++ b/mk/windows/vs2017-64/map_editor.vcxproj @@ -323,6 +323,11 @@ + + + PreserveNewest + + {8daa0c24-95cd-4f66-b4c5-19abdd771746}