mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 19:29:47 +02:00
Code Issues Projects Releases Wiki Activity

Fixed glest.ini

Browse Source
This commit is contained in:
mathusummut
2018-03-15 16:07:21 +01:00
parent a67441a392
commit c9194bb976
21 changed files with 134 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -89,8 +89,10 @@ $RECYCLE.BIN/
*.exe *.exe
*.msi *.msi
*.pdb *.pdb
unsuccessfulbuild
/mk/windows/dependencies/openssl /mk/windows/dependencies/openssl
/mk/windows/dependencies/src /mk/windows/dependencies/src
/data
# #
/mk/linux/zetaglest /mk/linux/zetaglest
/mk/linux/zetaglest_editor /mk/linux/zetaglest_editor

2
mk/windows/README.md
View File

@@ -9,8 +9,6 @@ To build ZetaGlest for the first time:
4. Run `build-zg.bat` in `/mk/windows`. 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`. 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: 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: Debug:

4
mk/windows/clone-deps.bat
View File

@@ -1,6 +1,6 @@
@echo off @echo off
setlocal 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]) 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
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. Echo.
git clone https://github.com/ZetaGlest/zlib.git dependencies/src/zlib git clone https://github.com/ZetaGlest/zlib.git dependencies/src/zlib
Echo. Echo.
git clone https://github.com/ZetaGlest/zetaglest-data.git ..\..\data
Echo.
:END :END
endlocal endlocal

18
mk/windows/glest.ini
View File

@@ -19,7 +19,7 @@ ColorBits=32
ConsoleMaxLines=7 ConsoleMaxLines=7
ConsoleMaxLinesStored=20 ConsoleMaxLinesStored=20
ConsoleTimeout=20 ConsoleTimeout=20
DataPath=$APPLICATIONDATAPATH\ DataPath=..\..\..\..\data
LogPath=$APPDATA\zetaglest\ LogPath=$APPDATA\zetaglest\
DayTime=1000 DayTime=1000
DebugLogFile=debug.log DebugLogFile=debug.log
@@ -86,7 +86,7 @@ Textures3D=true
TranslationGetURL=https://www.transifex.com/api/2/project/megaglest/resource/$file/translation/$language 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 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 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 TranslationGetURLLanguage=en
TranslationGetURLPassword= TranslationGetURLPassword=
TranslationGetURLUser=<enter username> TranslationGetURLUser=<enter username>
@@ -101,13 +101,13 @@ Windowed=false
; ;
; FIXME: There should be a way to use the "DataPath" variable ; FIXME: There should be a way to use the "DataPath" variable
; here (defined above) ; here (defined above)
PlaySoundAttention=data\core\menu\sound\attention.wav PlaySoundAttention=..\..\..\..\data\data\core\menu\sound\attention.wav
PlaySoundHighlight=data\core\menu\sound\highlight.wav PlaySoundHighlight=..\..\..\..\data\data\core\menu\sound\highlight.wav
PlaySoundNewServer=data\core\menu\sound\attention.wav PlaySoundNewServer=..\..\..\..\data\data\core\menu\sound\attention.wav
PlaySoundMarker=data\core\menu\sound\sonar.wav PlaySoundMarker=..\..\..\..\data\data\core\menu\sound\sonar.wav
; it's recommended that users not over-ride these. The sounds are just for ; it's recommended that users not over-ride these. The sounds are just for
; menu clicks and should remain very short in duration. ; menu clicks and should remain very short in duration.
PlaySoundMenuClickA=data\core\menu\sound\click_a.wav PlaySoundMenuClickA=..\..\..\..\data\data\core\menu\sound\click_a.wav
PlaySoundMenuClickB=data\core\menu\sound\click_b.wav PlaySoundMenuClickB=..\..\..\..\data\data\core\menu\sound\click_b.wav
PlaySoundMenuClickC=data\core\menu\sound\click_c.wav PlaySoundMenuClickC=..\..\..\..\data\data\core\menu\sound\click_c.wav

4
mk/windows/vs2015-32/.gitignore vendored
View File

@@ -15,4 +15,6 @@
*.lastbuildstate *.lastbuildstate
*.exp *.exp
*.ipch *.ipch
*.pch *.pch
*.ini
*.obj

5
mk/windows/vs2015-32/g3d_viewer.vcxproj
View File

@@ -260,5 +260,10 @@
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>

17
mk/windows/vs2015-32/glest_game.vcxproj
View File

@@ -755,6 +755,23 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\glest.rc" /> <ResourceCompile Include="..\glest.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\glestkeys.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\servers.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

5
mk/windows/vs2015-32/map_editor.vcxproj
View File

@@ -249,6 +249,11 @@
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

4
mk/windows/vs2015-64/.gitignore vendored
View File

@@ -15,4 +15,6 @@
*.lastbuildstate *.lastbuildstate
*.exp *.exp
*.ipch *.ipch
*.pch *.pch
*.ini
*.obj

5
mk/windows/vs2015-64/g3d_viewer.vcxproj
View File

@@ -330,6 +330,11 @@
<ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" /> <ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" /> <ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

17
mk/windows/vs2015-64/glest_game.vcxproj
View File

@@ -567,6 +567,23 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\glest.rc" /> <ResourceCompile Include="..\glest.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\glestkeys.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\servers.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

0
mk/windows/vs2015-64/libglestx64_obj/Release/libglest.tlog/unsuccessfulbuild
View File

5
mk/windows/vs2015-64/map_editor.vcxproj
View File

@@ -323,6 +323,11 @@
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

4
mk/windows/vs2017-32/.gitignore vendored
View File

@@ -15,4 +15,6 @@
*.lastbuildstate *.lastbuildstate
*.exp *.exp
*.ipch *.ipch
*.pch *.pch
*.ini
*.obj

5
mk/windows/vs2017-32/g3d_viewer.vcxproj
View File

@@ -255,6 +255,11 @@
<ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" /> <ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" /> <ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

17
mk/windows/vs2017-32/glest_game.vcxproj
View File

@@ -755,6 +755,23 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\glest.rc" /> <ResourceCompile Include="..\glest.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\glestkeys.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\servers.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

5
mk/windows/vs2017-32/map_editor.vcxproj
View File

@@ -249,6 +249,11 @@
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

4
mk/windows/vs2017-64/.gitignore vendored
View File

@@ -15,4 +15,6 @@
*.lastbuildstate *.lastbuildstate
*.exp *.exp
*.ipch *.ipch
*.pch *.pch
*.ini
*.obj

5
mk/windows/vs2017-64/g3d_viewer.vcxproj
View File

@@ -330,6 +330,11 @@
<ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" /> <ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" /> <ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

17
mk/windows/vs2017-64/glest_game.vcxproj
View File

@@ -567,6 +567,23 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\glest.rc" /> <ResourceCompile Include="..\glest.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\7z.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\glestkeys.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\..\shared\servers.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>

5
mk/windows/vs2017-64/map_editor.vcxproj
View File

@@ -323,6 +323,11 @@
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" /> <ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="libglest.vcxproj"> <ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project> <Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>