diff --git a/.gitignore b/.gitignore index f30cc8b5d..9eff9e747 100644 --- a/.gitignore +++ b/.gitignore @@ -104,7 +104,7 @@ unsuccessfulbuild # Makefile and cmake files are generated when the project is built and # should be ignored by git. # -# The ZetaGlest project recommends using a separate build directory. +# The Glest project recommends using a separate build directory. # build local-build diff --git a/.travis-before_install.sh b/.travis-before_install.sh index fea7de6cb..f72e39d80 100755 --- a/.travis-before_install.sh +++ b/.travis-before_install.sh @@ -1,11 +1,11 @@ #!/bin/bash # script for use with travis and on linux only # -# Copyright (c) 2015-2016 MegaGlest Team under GNU GPL v3.0+ +# Copyright (c) 2015-2016 Glest Team under GNU GPL v3.0+ # # Copyright (c) 2018 -# modified for ZetaGlest -# ZetaGlest Team +# modified for Glest +# Glest Team # This only needs to be changed when Travis updates the Ubuntu version # it's using. diff --git a/.travis.yml b/.travis.yml index 5b371faba..aae59ab6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ script: cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local; make && make install; echo 'Dependencies:'; - otool -L zetaglest; + otool -L glest; fi - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ] && [ $Tr_Compiler_Version = "6" ]; then mkdir build; @@ -88,7 +88,7 @@ script: notifications: irc: channels: - - "irc.freenode.org#zetaglest-dev" + - "irc.freenode.org#glest-dev" skip_join: true use_notice: true on_success: change diff --git a/AUTHORS.md b/AUTHORS.md index 188f3ce7c..392832319 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,10 +1,10 @@ -# AUTHORS.md +# Authors -This documents people who have contributed to ZetaGlest. If you are +This documents people who have contributed to Glest. If you are looking for information about the game from which it was forked, please -see the [MegaGlest credits page](https://megaglest.org/credits), [Glest credits page](http://glest.org/en/credits.php), or view GitHub's -[automated list of contributors](https://github.com/ZetaGlest/zetaglest-source/graphs/contributors), -which includes the _MegaGlest_ commit log. +see the [MegaGlest credits page](https://megaglest.org/credits), [MegaGlest credits page](http://megaglest.org/en/credits.php), or view GitHub's +[automated list of contributors](https://github.com/Glest/glest-source/graphs/contributors), +which includes the commit log. ## Programming @@ -15,8 +15,8 @@ which includes the _MegaGlest_ commit log. ### php || mysql -* [Martijn De Boer](https://github.com/sexybiggetje) | [Master Server](https://github.com/ZetaGlest/zetaglest-masterserver/graphs/contributors) -* [Craig Potter](https://github.com/craigpotter) | [Master Server](https://github.com/ZetaGlest/zetaglest-masterserver/graphs/contributors) +* [Martijn De Boer](https://github.com/sexybiggetje) | [Master Server](https://github.com/Glest/glest-masterserver/graphs/contributors) +* [Craig Potter](https://github.com/craigpotter) | [Master Server](https://github.com/Glest/glest-masterserver/graphs/contributors) ## Graphics, Animation, and Artwork diff --git a/BUILD.md b/BUILD.md index c8a593b8a..764add59b 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,43 +1,43 @@ # BUILD.md * **Getting the code:** - * [Set up the repositories locally](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#set-up-the-repositories-locally) - * [cloning](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#procedure-for-cloning) - * [Extra options for compiling](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#extra-options-for-compiling) + * [Set up the repositories locally](https://github.com/Glest/glest-source/blob/develop/BUILD.md#set-up-the-repositories-locally) + * [cloning](https://github.com/Glest/glest-source/blob/develop/BUILD.md#procedure-for-cloning) + * [Extra options for compiling](https://github.com/Glest/glest-source/blob/develop/BUILD.md#extra-options-for-compiling) * **Dependencies** - * [Windows](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#windows) - * [Linux, Mac OS, *BSD](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#linux) - * [Arch Linux](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#arch-linux) - * [Mac OS](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#mac-os) - * [BSD](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#bsd) + * [Windows](https://github.com/Glest/glest-source/blob/develop/BUILD.md#windows) + * [Linux, Mac OS, *BSD](https://github.com/Glest/glest-source/blob/develop/BUILD.md#linux) + * [Arch Linux](https://github.com/Glest/glest-source/blob/develop/BUILD.md#arch-linux) + * [Mac OS](https://github.com/Glest/glest-source/blob/develop/BUILD.md#mac-os) + * [BSD](https://github.com/Glest/glest-source/blob/develop/BUILD.md#bsd) -* [Installing](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#installing) +* [Installing](https://github.com/Glest/glest-source/blob/develop/BUILD.md#installing) * **Compiling** - * [Windows](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#windows) - * [Linux, Mac OS, *BSD](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md#windows-1) + * [Windows](https://github.com/Glest/glest-source/blob/develop/BUILD.md#windows) + * [Linux, Mac OS, *BSD](https://github.com/Glest/glest-source/blob/develop/BUILD.md#windows-1) ## Set up the repositories locally If you think you may be contributing to development, we suggest -[**forking**](https://github.com/ZetaGlest/zetaglest-source#fork-destination-box) +[**forking**](https://github.com/Glest/glest-source#fork-destination-box) and then **cloning your forks** of these 2 repositories. If you only want to build and test out the game, and have no plans of submitting patches, you don't need to worry about using the fork option (You can fork later if you change your mind). -* https://github.com/ZetaGlest/zetaglest-source -* https://github.com/ZetaGlest/zetaglest-data +* https://github.com/Glest/glest-source +* https://github.com/Glest/glest-data ### Procedure for cloning -1. Create a new directory to clone your **zetaglest-source** and -**zetaglest-data** into e.g. call it `ZetaGlest`. +1. Create a new directory to clone your **glest-source** and +**glest-data** into e.g. call it `Glest`. -2. Enter (or 'cd') into the new directory (`ZetaGlest` in the example). +2. Enter (or 'cd') into the new directory (`Glest` in the example). -3. clone **zetaglest-source** and **zetaglest-data** using the clone +3. clone **glest-source** and **glest-data** using the clone info provided by your fork or the main repos. (Use the "Clone or Download" link, but **do** select `clone` **not** `Download Zip`.) Make sure the cloned repo directories are in the same directory, adjacent to each other (and @@ -56,20 +56,20 @@ To view all available options, use `cmake .. -LH` while in the build directory. On Windows simply run `setup.bat` in `\mk\windows`. `setup.bat` also updates the game before rebuilding. Follow the -[instructions](https://github.com/ZetaGlest/zetaglest-source/blob/develop/mk/windows/README.md) +[instructions](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md) listed in the `Windows` directory for further information. ### Linux To get the game up and running quickly, use the following command: - git clone https://github.com/ZetaGlest/zetaglest-source.git zetaglest && sudo zetaglest/mk/linux/setup.sh + git clone https://github.com/Glest/glest-source.git glest && sudo glest/mk/linux/setup.sh Then run the following command to start the game: - zetaglest/mk/linux/build/zetaglest + glest/mk/linux/build/glest -To update and rebuild the game, simply rerun `sudo zetaglest/mk/linux/setup.sh`, as it performs a `git pull` as part of the process. +To update and rebuild the game, simply rerun `sudo glest/mk/linux/setup.sh`, as it performs a `git pull` as part of the process. #### For a more thorough approach: @@ -121,16 +121,16 @@ lua51 miniupnpc openal sdl2 wxgtk3 xerces-c cmake ftjam git mesa` ## Installing Now that you have the source code and the dependencies, you can either -compile ZetaGlest and run it without installing, or you can set options +compile Glest and run it without installing, or you can set options to install it. If you plan to **install**, then you can **skip the sections below** and read -[INSTALL.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/INSTALL.md) +[INSTALL.md](https://github.com/Glest/glest-source/blob/develop/INSTALL.md) ## Compiling ### Windows - ./build-zg.bat + ./build.bat ### Linux, Mac OS, BSD @@ -156,11 +156,10 @@ On Linux, `X` can be substituted with `$(grep -c ^processor /proc/cpuinfo)`, to make -j$(grep -c ^processor /proc/cpuinfo) -The zetaglest binaries will be in the `build/` directory. Run -`./zetaglest` to start the game. +The glest binaries will be in the `build/` directory. Run +`./glest` to start the game. - -See [running](https://github.com/ZetaGlest/zetaglest-source#running) for +See [running](https://github.com/Glest/glest-source#running) for detailed information about running a server or hosting a game. After you run `cmake` for the first time, you won't need to specify any @@ -175,4 +174,3 @@ If you want to completely erase your previously-used options, remove If your build doesn't seem to be using the options you gave it, first try removing CMakeCache.txt and rebuilding. - diff --git a/CMakeLists.txt b/CMakeLists.txt index 799431f75..0171ef435 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 ) -PROJECT( ZetaGlest ) +PROJECT( Glest ) -# The ZetaGlest CMakeLists is not supported on Windows. To compile on Windows, please use +# The Glest CMakeLists is not supported on Windows. To compile on Windows, please use # setup.bat in mk/windows #SET(CMAKE_VERBOSE_MAKEFILE ON) @@ -33,7 +33,7 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") ADD_DEFINITIONS("-Wno-switch") ENDIF() -OPTION(BUILD_ZETAGLEST "Build ZetaGlest" ON) +OPTION(BUILD_GLEST "Build Glest" ON) OPTION(WANT_STATIC_LIBS "Builds as many static libs as possible." OFF) OPTION(WANT_USE_OpenSSL "Use libOpenSSL during CURL linking." ON) OPTION(WANT_USE_FriBiDi "Enable libFriBIDi support." ON) @@ -45,7 +45,7 @@ include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/SpecialMacros.cmake) include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/ReqVersAndStaticConf.cmake) MESSAGE(STATUS "=====================================================================") -SET(PKG_NAME "zetaglest") +SET(PKG_NAME "glest") SET(PIC_FLAG "${PIC_FLAG} -fPIC") IF(WANT_STATIC_LIBS AND "${CMAKE_SIZEOF_VOID_P}" EQUAL "8") @@ -193,7 +193,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) ENDIF() # The data dir will get defined as a macro at compile-time IF(NOT INSTALL_DIR_DATA) - SET(INSTALL_DIR_DATA "${CMAKE_INSTALL_PREFIX}/share/zetaglest/" CACHE PATH "The installation path for data files") + SET(INSTALL_DIR_DATA "${CMAKE_INSTALL_PREFIX}/share/glest/" CACHE PATH "The installation path for data files") ENDIF() SET(INSTALL_DIR_INI "${INSTALL_DIR_DATA}") IF(NOT INSTALL_DIR_DESKTOP) @@ -206,13 +206,13 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) SET(INSTALL_DIR_MAN "${CMAKE_INSTALL_PREFIX}/share/man/man6/" CACHE PATH "The installation path for manpage files") ENDIF() - string(TOUPPER "${CMAKE_BUILD_TYPE}" ZG_BUILD_TYPE) + string(TOUPPER "${CMAKE_BUILD_TYPE}" GLEST_BUILD_TYPE) # We do some funky character escaping to get the right stuff written out to # the final Makefile so we get the GIT Global Revsion # - string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}}") + string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_${GLEST_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${GLEST_BUILD_TYPE}}") - message(STATUS "CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}}") + message(STATUS "CMAKE_CXX_FLAGS_${GLEST_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${GLEST_BUILD_TYPE}}") # Win32 specific Compiler Flags IF(WIN32) @@ -248,9 +248,9 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/") MESSAGE(STATUS "**Found game source code.") ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/shared_lib ) - ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_game ) + ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/game ) #if(wxWidgets_FOUND) - ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor ) + ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/map_editor ) ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer ) #else() # MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine") @@ -266,11 +266,11 @@ ENDIF() # at compile-time. That allows the binary to find the data no matter # where it is, and whether or not it has actually been installed # -IF(EXISTS "${PROJECT_SOURCE_DIR}/../zetaglest-data/CMakeLists.txt") +IF(EXISTS "${PROJECT_SOURCE_DIR}/../glest-data/CMakeLists.txt") MESSAGE(STATUS "**Found game data.") # using CMAKE_BINARY_DIR as last parameter will output cmake files into the same # directory as the source build. - ADD_SUBDIRECTORY(${PROJECT_SOURCE_DIR}/../zetaglest-data ${CMAKE_BINARY_DIR}/data) + ADD_SUBDIRECTORY(${PROJECT_SOURCE_DIR}/../glest-data ${CMAKE_BINARY_DIR}/data) ENDIF() IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") @@ -278,7 +278,7 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") ENDIF() # FIXME: This should output all defines. For example, DATADIR is defined in -# the glest_game source and sharedlib cmake file as well +# the game source and sharedlib cmake file as well get_directory_property( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) foreach( d ${DirDefs} ) message( STATUS "=====> Found Define: " ${d} ) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1629a6ea3..b0aa43f7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # CONTRIBUTING -Welcome to the ZG project! Thank you for reading this document and +Welcome to the Glest project! Thank you for reading this document and considering contributing. Anyone is welcome to join our [Discord server](https://discord.gg/WaAaXS7). @@ -11,13 +11,13 @@ Please remember to "star" this project. ## Website Design -Documentation for designing the websites is in [WEBSITE_DESIGN.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/WEBSITE_DESIGN.md). +Documentation for designing the websites is in [WEBSITE_DESIGN.md](https://github.com/Glest/glest-source/blob/develop/WEBSITE_DESIGN.md). ## Mods, tech trees, scenarios, tilesets, maps Guidelines for submitting or letting us know about content you've created can be found on the data repo at -[zetaglest-data#submitting-mods-tech-trees-tilesets-maps-scenarios](https://github.com/ZetaGlest/zetaglest-data#submitting-mods-tech-trees-tilesets-maps-scenarios) +[glest-data#submitting-mods-tech-trees-tilesets-maps-scenarios](https://github.com/Glest/glest-data#submitting-mods-tech-trees-tilesets-maps-scenarios) Our goal with content contributed by artists are: @@ -28,24 +28,24 @@ Our goal with content contributed by artists are: ## Issues -ZetaGlest Issues are filed on these repositories: +Glest Issues are filed on these repositories: -* [zetaglest-source Issues](https://github.com/ZetaGlest/zetaglest-source/issues) -* [zetaglest-data Issues](https://github.com/ZetaGlest/zetaglest-data/issues) -* [zetaglest-masterserver Issues](https://github.com/ZetaGlest/zetaglest-masterserver/issues) -* [ZetaGlest web site](https://github.com/ZetaGlest/zetaglest.github.io) +* [glest-source Issues](https://github.com/Glest/glest-source/issues) +* [glest-data Issues](https://github.com/Glest/glest-data/issues) +* [glest-masterserver Issues](https://github.com/Glest/glest-masterserver/issues) +* [Glest web site](https://github.com/Glest/glest.github.io) Don't worry about focusing on every repo in the above list. Each repo is separated by -category. For example, zetaglest-source is for source code, zetaglest-data is for game data. +category. For example, glest-source is for source code, glest-data is for game data. We don't expect contributors to keep track of issues in every repository. If you stay with the project for a while, you will not have any problem finding your way around. For new users, it's recommended to focus on only one repository. However, if you are curious to get an overview of every issue filed from the repo list above, this -link will display a combined list of issues across every repository in the ZetaGlest +link will display a combined list of issues across every repository in the Glest organization. -[https://github.com/issues?q=is%3Aopen+is%3Aissue+org%3AZetaGlest](https://github.com/issues?q=is%3Aopen+is%3Aissue+org%3AZetaGlest) +[https://github.com/issues?q=is%3Aopen+is%3Aissue+org%3AGlest](https://github.com/issues?q=is%3Aopen+is%3Aissue+org%3AGlest) If you find an issue that interests you, please leave a note asking about it first. If you don't see that anyone has inquired about it, you can simply @@ -90,9 +90,9 @@ Problems arise when multiple patches are included in a single pull request: from being merged See the instructions in -[BUILD.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md) +[BUILD.md](https://github.com/Glest/glest-source/blob/develop/BUILD.md) for important information about how to clone your forks so you can -easily contribute patches, graphics, or other content to the ZetaGlest +easily contribute patches, graphics, or other content to the Glest repositories. ## Pull Requests @@ -103,23 +103,23 @@ you can practice at the repository [Practice Git](https://github.com/grayghostvi Follow the steps below if you are contributing to any of these repositories: -* [source](https://github.com/ZetaGlest/zetaglest-source) -* [data](https://github.com/ZetaGlest/zetaglest-data) -* [masterserver](https://github.com/MegaGlest/megaglest-masterserver) -* [website](https://github.com/ZetaGlest/zetaglest.github.io) +* [source](https://github.com/Glest/glest-source) +* [data](https://github.com/Glest/glest-data) +* [masterserver](https://github.com/Glest/glest-masterserver) +* [website](https://github.com/Glest/glest.github.io) -Below, *zetaglest-source* is used for the example, but if you are working on another repository, -be sure to replace **zetaglest-source** with the appropriate repo url, using the URL of +Below, *glest-source* is used for the example, but if you are working on another repository, +be sure to replace **glest-source** with the appropriate repo url, using the URL of your fork. -1. [Fork the repo](https://github.com/ZetaGlest/zetaglest-source/fork) (if you haven't already done so) +1. [Fork the repo](https://github.com/Glest/glest-source/fork) (if you haven't already done so) 2. Clone it to your computer 3. When you're ready to work on an issue, be sure you're on the **develop** branch. From there, [create a separate branch](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches) (e.g. issue_32) 4. Make your changes. If you're unsure of some details while you're making edits, you can discuss them on the ticket. -5. Add yourself to the [AUTHORS.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/AUTHORS.md) file +5. Add yourself to the [AUTHORS.md](https://github.com/Glest/glest-source/blob/develop/AUTHORS.md) file 6. Commit your changes. [git-cola](https://git-cola.github.io/) is a nice GUI front-end for adding files and entering commit messages (git-cola is probably available from your OS repository). @@ -141,6 +141,6 @@ Periodically, especially before starting a new patch, you'll need to sync your repo with the remote upstream. GitHub has instructions for doing this: 1. [Configuring a remote for a fork](https://help.github.com/articles/configuring-a-remote-for-a-fork/) - * For step 3 on that page, use https://github.com/ZetaGlest/zetaglest-source for the URL. + * For step 3 on that page, use https://github.com/Glest/glest-source for the URL. 2. [Syncing a Fork](https://help.github.com/articles/syncing-a-fork/) * On that page, it shows how to merge the **develop** branch (steps 4 & 5 of **Syncing a Fork**). diff --git a/ChangeLog.md b/ChangeLog.md index 638a5620a..9ef5cd75a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,7 +1,7 @@ -# ZetaGlest ChangeLog +# Glest ChangeLog To see a full timeline of detailed changes please visit: -https://github.com/ZetaGlest/zetaglest-source/commits/develop +https://github.com/Glest/glest-source/commits/develop v1.0 @@ -14,30 +14,30 @@ v1.0 - Forest tilesets are more animated - You can leave and re-join network games, even if you experience lag (buggy) - Console now hidden by default on Windows -- [Default command is changed to "attack" instead of "move", which is much more intuitive](https://github.com/ZetaGlest/zetaglest-source/commit/2c4fc340de958f6b94b40ee62eabff015625e62b) - (pressing "a" not needed anymore); ["m" key can be used for "move"](https://github.com/ZetaGlest/zetaglest-source/commit/bf5a04be18f2b16b8a565acff4baabc5fbfed293). +- [Default command is changed to "attack" instead of "move", which is much more intuitive](https://github.com/Glest/glest-source/commit/2c4fc340de958f6b94b40ee62eabff015625e62b) + (pressing "a" not needed anymore); ["m" key can be used for "move"](https://github.com/Glest/glest-source/commit/bf5a04be18f2b16b8a565acff4baabc5fbfed293). - Updated UI to look more modern - Improved OOS detection, which also helps detect cheating -- [Transparency of the alpha component of textures can now be set](https://zetaglest.github.io/docs/modelling/textures.html#Transparency)/ +- [Transparency of the alpha component of textures can now be set](https://glest.github.io/docs/modelling/textures.html#Transparency)/ - Updated [miniz](https://github.com/richgel999/miniz) library. Thanks to [richgel999](https://github.com/richgel999) and the miniz contributors. - CMakeLists.txt files have had a major tune-up (doesn't affect Windows users) - OpenBSD build instructions added and updated -- [INSTALL.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/INSTALL.md) document created +- [INSTALL.md](https://github.com/Glest/glest-source/blob/develop/INSTALL.md) document created - man pages are no longer generated each time a build is performed. They must be manually generated when the help usage output is changed. - Upgraded [libircclient](https://sourceforge.net/projects/libircclient/) embedded library from 1.3 to 1.10 - Added support for Windows 10 SDK -- [16 maps added](https://github.com/ZetaGlest/zetaglest-data/compare/4c67d4bfba21...9dfb37450e07) -- [[d1acd87](https://github.com/ZetaGlest/zetaglest-source/commit/d1acd8742395bca8b37656e9e8065022902586fe)]Lua can now be used in scripts tag in faction tag within XML -- [[bugfix:835c6ef](https://github.com/ZetaGlest/zetaglest-source/commit/835c6efd924ed7e62ccd43e064bc6b7f5cdecbfc)]Fixed "x" key getting stuck on Windows -- [[045b0b8](https://github.com/ZetaGlest/zetaglest-source/commit/045b0b88e051f7163fbef42fa0adc63a326ca186)]Removed "MG_" and "xxx" (3 digit extension) on nicknames in lobby player list -- [Windows](https://github.com/ZetaGlest/zetaglest-source/commits/develop/mk/windows) build system, dependencies, and documentation updated +- [16 maps added](https://github.com/Glest/glest-data/compare/4c67d4bfba21...9dfb37450e07) +- [[d1acd87](https://github.com/Glest/glest-source/commit/d1acd8742395bca8b37656e9e8065022902586fe)]Lua can now be used in scripts tag in faction tag within XML +- [[bugfix:835c6ef](https://github.com/Glest/glest-source/commit/835c6efd924ed7e62ccd43e064bc6b7f5cdecbfc)]Fixed "x" key getting stuck on Windows +- [[045b0b8](https://github.com/Glest/glest-source/commit/045b0b88e051f7163fbef42fa0adc63a326ca186)]Removed "MG_" and "xxx" (3 digit extension) on nicknames in lobby player list +- [Windows](https://github.com/Glest/glest-source/commits/develop/mk/windows) build system, dependencies, and documentation updated - Now allows cross-version network games if the data is the same - These units can now heal mobile units from their own factions that are in range: nurse (British, radius of 15), archmage_tower (Magic, radius of 8) - Auto-healing radius changed from 8 to 15 (with the exception of Valhalla) - Units standing near Valhalla (norse) are auto-healed (radius of 8) - Supports importing units from other factions, such as by creating a folder named "fakir" in "tech" with a file "fakir.xml" with the following text: - `````` + `````` - These units can now heal mobile units from their own factions that are in range (radius of 8): priest (Egypt) wartime mechanic (Romans) @@ -49,20 +49,20 @@ v1.0 H -> T (Toggle team chat) T -> Z (Cycle between store units) M is now the hotkey for "move" when units are selected -- [Replaced the sphinx with the scarab](https://github.com/ZetaGlest/zetaglest-data/commit/60e734180ecb7f925144c94bef339e6130f9ae20) +- [Replaced the sphinx with the scarab](https://github.com/Glest/glest-data/commit/60e734180ecb7f925144c94bef339e6130f9ae20) (Egypt's starting units) - 4 new tactical scenarios were added / Thanks @ [Julie Marchant](https://github.com/onpon4) Witches' Hunt Native Unrest Warlock Overlords Death Road -- [#13](https://github.com/ZetaGlest/zetaglest-source/issues/13) +- [#13](https://github.com/Glest/glest-source/issues/13) Observers no longer take up slots on a map. For instance, a map being played by 4 players can have a 5th person observing; a map being played by 8 people can have a 9th person observing. Up to 10 people can connect, which mean you can have up to 6 observers with a 4-player map, and 2 with an 8-player map. -- [#6](https://github.com/ZetaGlest/zetaglest-source/issues/6) Players can now enter the multiplayer lobby unconditionally +- [#6](https://github.com/Glest/glest-source/issues/6) Players can now enter the multiplayer lobby unconditionally - Replaced the Egypt graphics with Archmage's remaster: https://github.com/virtushda/EgyptRemaster # MegaGlest ChangeLog @@ -87,7 +87,7 @@ v3.13.0 - improved AI behavior per faction ( mostly magic ) v3.12.0 -- MegaGlest uses SDL2 now +- Glest uses SDL2 now - glowing meshes. ( models can glow like particles do ) - console message for finished upgrades - new parameter to set servers titles @@ -105,7 +105,7 @@ v3.11.1 - nicer tilesets as defaults - improved camera startposition on game start ( main building in center ) - attackBoosts: Ep + Hp regeneration is shown in description -- MegaGlest can be build easier on MacOS ( sadly noone was willing to test ) +- Glest can be build easier on MacOS ( sadly noone was willing to test ) v3.11.0 - healthbars with a lot of options @@ -125,9 +125,9 @@ v3.11.0 - You can have non commandable units - Units spawned by an attack skill can get an attack command - Unit and Splash particles can be speeded up ( accelerated ) -- Looting https://github.com/MegaGlest/megaglest-source/pull/17 +- Looting https://github.com/Glest/glest-source/pull/17 - HP and EP starting values -- can be given https://docs.megaglest.org/XML/Unit#target-height +- can be given https://docs.glest.org/XML/Unit#target-height - +several bugfixes v3.10.0 This version was skipped because of version number trouble. @@ -139,7 +139,7 @@ v3.9.1 - Better handling of lagging clients in network games - Fixed cmake scripts to correctly detect dependencies that were previously partially working on some distros and improved build support for Mac OS X -- Added numerous new LUA functions as documented at http://wiki.megaglest.org +- Added numerous new LUA functions as documented at http://wiki.glest.org - Code quality improvements as reported by cppcheck and coverity (and clang) - Better color picking algorithm thanks to willvarfar makes color picking very stable - Render order improved to allow more transparency effects @@ -198,7 +198,7 @@ v3.7.0 - network multi-player scenarios - campaign scenarios - Integrated language translation support (translate / update your favorite language @ - https://www.transifex.com/projects/p/megaglest and pull the files into the game via + https://www.transifex.com/projects/p/glest and pull the files into the game via advanced translation options to test your changes) - play a sound when player mentions your name in chat mode - more game data validation for commandline modders, see --help for more info @@ -225,13 +225,13 @@ v3.7.0 v3.6.0 - bugfixes reported in the bugs forum from beta1 and 2 -- iso639-1 style language loading example: megaglest --use-language=zh and auto language +- iso639-1 style language loading example: glest --use-language=zh and auto language detect on first time launch - new and updated translations (Greek, Japanese, Russian, Italian, Czech etc) - auto complete player names in chat mode using tab character - customized port # override via commandline (useful for multiple headless servers) example: - megaglest --use-ports=x,y (x is internal port y is external port) -- new commandline option to support standalone modes example: megaglest --load-mod=x + glest --use-ports=x,y (x is internal port y is external port) +- new commandline option to support standalone modes example: glest --load-mod=x (x is the path to the mod) - new lua functions added (to be documented on the MG wiki) - lower CPU / RAM requirements in headless server mode @@ -244,7 +244,7 @@ v3.6.0 - New ability to enable in game team-switching for defecting to other teams in game - Ability to toggle languages anywhere in the game using CTRL-L - Numerous bug fixes as reported in the bugs forum -- Improved Megapack including better balanced Romans faction +- Improved FactionPack including better balanced Romans faction - New attack boost system (currently used by Romans faction) which allows new types of in game unit effects. - New headless server mode allows dedicated servers to host games for network players @@ -261,10 +261,10 @@ v3.6.0 - many more... v3.5.2 -- Lots of work to make MegaGlest a Linux distro friendly package (Debian, Arch, etc) +- Lots of work to make Glest a Linux distro friendly package (Debian, Arch, etc) - Added Support for Russian and Ukrainian with proper fonts in Linux if installed. - Map editor now supports diagonal flipping -- Windows users now have a shortcut to the mod folder in their MegaGlest programs Menu. +- Windows users now have a shortcut to the mod folder in their Glest programs Menu. - Bug fixes including: - Fix corrupted g3d viewer screenshots, and automatic screenshot mode does not steal focus for Linux users @@ -278,9 +278,9 @@ v3.5.2 3.5.1 - Much better pathfinder performance - Allow servers to temporary block specified network players from the game lobby -- Better Linux distro packaing support (by default megaglest works in standard linux +- Better Linux distro packaing support (by default glest works in standard linux paths and make install added) -- Game data cleanup (duplicate sound files have been merged in megapack) and non free +- Game data cleanup (duplicate sound files have been merged in factionpack) and non free content replaced. (autumn and desert tilesets) - Displayed up to 15 queued commands (observers can view all players queued commands) - Allow factions in a techtree to share common data using the special tag in xml files @@ -322,7 +322,7 @@ v3.5.2 - better support for multiple platform compiling - Modifiable keyboard hotkeys - bugfixes for map editor and g3d viewer to work more stable on multiple platforms -- LSB conform ".megaglest" usage +- LSB conform ".glest" usage 3.4.0 @@ -332,14 +332,14 @@ v3.5.2 UPNP enabled routers) - new network file transfer system current allows servers to send missing maps and tilesets to clients -- new IRC client built into the Internet lobby (uses freenode's megaglest-lobby channel) +- new IRC client built into the Internet lobby (uses freenode's glest-lobby channel) - improved sound handling for better stability and smoother game play - CPU AI players now can have their resource multiplier manually changed - new fog of war setting allows showing resources on the map at game start (thanks GAE team) - many new commandline options (try --help to see) - texture compression for video cards that support it - improved AI players are much harder to defeat -- new Romans_beta faction in megapack +- new Romans_beta faction in factionpack - new language translations - new tilesets, maps and a tutorials - G3D Viewer enhancements including PNG screenshots with alpha transparency option @@ -411,7 +411,7 @@ v3.5.2 3.3.5 - major milestone: - http://freegamer.blogspot.com/2010/06/megaglest-335-pre-release-special.html + http://freegamer.blogspot.com/2010/06/glest-335-pre-release-special.html - Thank you to: titi, tomreyn, silnarm, rcl, ultifd, wciow, claymore, coldfusionstorm, FG_Julius (and crew), softcoder - Added loads of Network features (See below) @@ -513,7 +513,7 @@ v3.5.2 - all network related errors should be handled with a dialog and doesn't crash glest any more. 3.3.0 -- New multiplayer version of megaglest! It should be much more stable now +- New multiplayer version of glest! It should be much more stable now and less choppy than original glest ! - New disconnect messages and chat in connect menu ..... - Now with several particles for every skill! @@ -534,7 +534,7 @@ v3.5.2 The editor includes things like undo/redo, brush copy , mouseover display now 3.2.3 -- MegaGlest forks off vanilla Glest +- Glest forks off vanilla Glest - Only needed factions are loaded ( thanks silnarm ). - a weeker CPU player was added for real beginners - two new CPU players were added ( CPU-Mega and CPU-Easy ) diff --git a/INSTALL.md b/INSTALL.md index 118594e77..dfe0dc190 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,22 +1,19 @@ -# Installing ZetaGlest +# Installing Glest You can install from source or download Installers or packages for your operating system. ## Binary Packages -**Note:** Installation is not necessary to run the game. You can build -the game from source and run it without installing - ## Windows -* [ZetaGlest Windows Installer](https://github.com/ZetaGlest/windows-installer) -* [Build and Install from source code](https://github.com/ZetaGlest/zetaglest-source/blob/develop/mk/windows/README.md) +* [Glest Windows Installer](https://github.com/Glest/windows-installer) +* [Build and Install from source code](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md) ## Linux, Mac OS, BSD Review the dependency information and instructions for [building from -source](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md). +source](https://github.com/Glest/glest-source/blob/develop/BUILD.md). From the top of the project source directory: @@ -51,7 +48,7 @@ directories when `-DCMAKE_INSTALL_PREFIX=/home/andy/local` is used: INSTALL_DIR_BIN:PATH=/home/andy/local/games // The installation path for data files -INSTALL_DIR_DATA:PATH=/home/andy/local/share/zetaglest +INSTALL_DIR_DATA:PATH=/home/andy/local/share/glest // The installation path for desktop files INSTALL_DIR_DESKTOP:PATH=/home/andy/local/applications @@ -66,12 +63,12 @@ INSTALL_DIR_MAN:PATH=/home/andy/local/share/man/man6 If you wish to install to a location that does not require super-user privileges, change '/usr' to a location to which you have write access. -See [running](https://github.com/ZetaGlest/zetaglest-source#running) for +See [running](https://github.com/Glest/glest-source#running) for detailed information about running a server or hosting a game. The value for INSTALL_DIR_DATA is written to the game when compiled, therefore if you ever move your data directory, you will have to -recompile ZetaGlest. +recompile Glest. After you run `cmake` for the first time, you won't need to specify any options unless you want to change previously-used options. Just use @@ -87,14 +84,12 @@ If your build doesn't seem to be using the options you gave it, first try removing CMakeCache.txt and rebuilding. **Note:** The majority of the game data is not installed during the -steps above. The files from the zetaglest-data repo must be copied into -CMAKE_INSTALL_PREFIX/share/zetaglest, or specify an existing path to +steps above. The files from the glest-data repo must be copied into +CMAKE_INSTALL_PREFIX/share/glest, or specify an existing path to data by adding this option to cmake: `-DINSTALL_DIR_DATA=` -(data packages will be created soon -andy5995 2018-09-16) - #### Uninstalling Makefiles generated with cmake do not have an 'uninstall' option. There diff --git a/COPYING b/LICENSE similarity index 100% rename from COPYING rename to LICENSE diff --git a/README.md b/README.md index 10142659b..9d29ba9ff 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ [![Build Status](https://travis-ci.org/ZetaGlest/zetaglest-source.svg?branch=develop)](https://travis-ci.org/ZetaGlest/zetaglest-source) -# ZetaGlest +# Glest -**Official Website: https://zetaglest.github.io** +**Official Website: https://glest.github.io** -[ZetaGlest](https://zetaglest.github.io) is a network multi-player real-time strategy game engine. -It's shipped with the ZetaPack mod, which includes several factions, -each one consisting of many 3d characters. The factions are loosely +[Glest](https://glest.github.io) is a network multi-player real-time strategy game engine. +It includes several factions, each one consisting of many 3d characters. The factions are loosely based on historical empires with added elements of fantasy, such as mummies produced by Egyptian priests, Indian shamans who summon thunderbirds for air assaults, and Norsemen who can build flying @@ -14,59 +13,58 @@ valkries and "Thors". Start the game by harvesting natural resources, then use the cash to produce an army. Single-player mode against the CPU is also available. -![ZetaGlest ScreenShot](https://zetaglest.github.io/docs/assets/screenshots/screen147.jpg) +![Glest Screenshot](https://glest.github.io/docs/assets/screenshots/screen147.jpg) ## Download for Windows -#### Download [ZetaGlest 1.0 from here](https://github.com/ZetaGlest/windows-installer/archive/1.0.zip). +#### Download [Glest 1.0 from here](https://github.com/Glest/windows-installer/archive/1.0.zip). Additionally, if you want to contribute with the code on Windows, [please follow these -instructions](https://github.com/ZetaGlest/zetaglest-source/blob/develop/mk/windows/README.md). +instructions](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md). For other operating systems, you must [**build and install from -source**](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md) +source**](https://github.com/Glest/glest-source/blob/develop/BUILD.md) (Later, we'll be providing binary packages). ## Quick Build Guide for Linux For Linux, run the following command: - git clone https://github.com/ZetaGlest/zetaglest-source.git zetaglest && sudo zetaglest/mk/linux/setup.sh + git clone https://github.com/Glest/glest-source.git glest && sudo glest/mk/linux/setup.sh Then run the following command to start the game: - zetaglest/mk/linux/build/zetaglest + glest/mk/linux/build/glest ## Links -* **[Screenshots](https://github.com/ZetaGlest/screenshots)** +* **[Screenshots](https://github.com/Glest/screenshots)** * **[Discord](https://discord.gg/WaAaXS7)** -* **[Server list and player stats](http://master.megaglest.org)** -* [FAQ](https://zetaglest.github.io/docs/faq.html) -* [Compiling](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md) -* [Contributing and Testing](https://github.com/ZetaGlest/zetaglest-source#contributing-and-testing) -* [ChangeLog](https://github.com/ZetaGlest/zetaglest-source/blob/develop/ChangeLog.md) -* [Detailed information about units in the game](https://zetaglest.github.io/docs) +* **[Server list and player stats](http://master.glest.org)** +* [FAQ](https://glest.github.io/docs/faq.html) +* [Compiling](https://github.com/Glest/glest-source/blob/develop/BUILD.md) +* [Contributing and Testing](https://github.com/Glest/glest-source#contributing-and-testing) +* [ChangeLog](https://github.com/Glest/glest-source/blob/develop/ChangeLog.md) +* [Detailed information about units in the game](https://glest.github.io/docs) ### Extra Tech trees, mods, tilesets, scenarios -* [MODS.md](https://github.com/ZetaGlest/zetaglest-data/blob/develop/MODS.md) -* [TILESETS.md](https://github.com/ZetaGlest/zetaglest-data/blob/develop/TILESETS.md) -* [SCENARIOS.md](https://github.com/ZetaGlest/zetaglest-data/blob/develop/SCENARIOS.md) +* [MODS.md](https://github.com/Glest/glest-data/blob/develop/MODS.md) +* [TILESETS.md](https://github.com/Glest/glest-data/blob/develop/TILESETS.md) +* [SCENARIOS.md](https://github.com/Glest/glest-data/blob/develop/SCENARIOS.md) ### Contributing and Testing If you'll be contributing code or changes to data, the procedures for -forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/CONTRIBUTING.md) +forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) -Please see [CONTRIBUTING.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/CONTRIBUTING.md) +Please see [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) for extended, important instructions and guidelines for contributing. -To run your own headless (dedicated) server, see [the FAQ](https://zetaglest.github.io/docs/faq.html#headlessserver). +To run your own headless (dedicated) server, see [the FAQ](https://glest.github.io/docs/faq.html#headlessserver). ### Contact Us * [Discord](https://discord.gg/WaAaXS7) -* [Message Board](https://groups.google.com/forum/#!forum/zetaglest) -* Email: zetaglest@gmail.com +* Email: mathusum.mut@gmail.com diff --git a/WEBSITE_DESIGN.md b/WEBSITE_DESIGN.md index 788dab79e..7c8ca4d25 100644 --- a/WEBSITE_DESIGN.md +++ b/WEBSITE_DESIGN.md @@ -2,43 +2,41 @@ ## Unit Documentation -### https://zetaglest.github.io/ +### https://glest.github.io/ -The repo is at https://github.com/ZetaGlest/zetaglest.github.io +The repo is at https://github.com/Glest/glest.github.io #### Files in the root folder Files are published to the web site automatically when the repo is updated. -The style sheet is in [media](https://github.com/ZetaGlest/zetaglest.github.io/tree/master/convert_faction_xml2html/media) +The style sheet is in [media](https://github.com/Glest/glest.github.io/tree/master/convert_faction_xml2html/media) And it's copied to the root folder of the website when the -[perl script](https://github.com/ZetaGlest/zetaglest.github.io/blob/master/convert_faction_xml2html/convert_faction_xml2html.pl) +[perl script](https://github.com/Glest/glest.github.io/blob/master/convert_faction_xml2html/convert_faction_xml2html.pl) is run. The script generates the html (which is how you'd preview your changes). Part of the template for the site is in the perl script, and another part is in -[an ini file](https://github.com/ZetaGlest/zetaglest.github.io/blob/master/convert_faction_xml2html/zetapack.ini). +[an ini file](https://github.com/Glest/glest.github.io/blob/master/convert_faction_xml2html/factionpack.ini). ## Primary documentation -### Files in [docs](https://github.com/ZetaGlest/zetaglest.github.io/tree/master/docs) +### Files in [docs](https://github.com/Glest/glest.github.io/tree/master/docs) -See the [README in that folder](https://github.com/ZetaGlest/zetaglest.github.io/blob/master/docs/README.md) -for an explanation of how to edit the html files in zetaglest.github.io/docs. +See the [README in that folder](https://github.com/Glest/glest.github.io/blob/master/docs/README.md) +for an explanation of how to edit the html files in glest.github.io/docs. ## Server list and player stats -### https://zetaglest.dreamhosters.com/ +### https://glest.dreamhosters.com/ The repo is at -https://github.com/ZetaGlest/zetaglest-masterserver and the +https://github.com/Glest/glest-masterserver and the instructions are in -[docs/README.txt](https://github.com/ZetaGlest/zetaglest-masterserver/blob/develop/docs/README.md) +[docs/README.txt](https://github.com/Glest/glest-masterserver/blob/develop/docs/README.md) To help with testing you can also use this: - * [exported database](https://github.com/ZetaGlest/zetaglest-masterserver/blob/develop/docs/mysql_zetaglest_dreamhosters_com_exported_20180616.sql) in SQL format - - + * [exported database](https://github.com/Glest/glest-masterserver/blob/develop/docs/mysql_glest_dreamhosters_com_exported_20180616.sql) in SQL format diff --git a/man/zetaglest.6 b/man/glest.6 similarity index 84% rename from man/zetaglest.6 rename to man/glest.6 index d0bb6f285..af0a9e8aa 100644 --- a/man/zetaglest.6 +++ b/man/glest.6 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. -.TH ZETAGLEST "6" "September 2018" "zetaglest v0.8.02" "Games" +.TH GLEST "6" "September 2018" "glest v0.8.02" "Games" .SH NAME -zetaglest \- 3D\ multi-player\ real\ time\ strategy\ game +glest \- 3D\ multi-player\ real\ time\ strategy\ game .SH SYNOPSIS -.B zetaglest +.B glest [\fI\,OPTION\/\fR]... \fI\,VALUE\/\fR... .SH DESCRIPTION -Options for running zetaglest from the command line +Options for running glest from the command line .HP \fB\-\-help\fR .IP @@ -170,7 +170,7 @@ the above flags being set. .IP example: .IP -zetaglest \fB\-\-validate\-techtrees\fR=\fI\,zetapack\/\fR,vbros_pack_5 +glest \fB\-\-validate\-techtrees\fR=\fI\,factionpack\/\fR,vbros_pack_5 .PP \fB\-\-validate\-factions\fR=\fI\,x=purgeunused=purgeduplicates=hideduplicates\/\fR .IP @@ -198,7 +198,7 @@ validation to NOT SHOW duplicate files in the techtree. .IP \fB\-\-validate\-techtrees\fR .IP -example: zetaglest \fB\-\-validate\-factions\fR=\fI\,tech\/\fR,egypt +example: glest \fB\-\-validate\-factions\fR=\fI\,tech\/\fR,egypt .PP \fB\-\-validate\-scenario\fR=\fI\,x=purgeunused=gitdelete\/\fR .IP @@ -214,7 +214,7 @@ validation to delete extra files in the scenario that .IP are not used. .IP -example: zetaglest \fB\-\-validate\-scenario\fR=\fI\,stranded\/\fR +example: glest \fB\-\-validate\-scenario\fR=\fI\,stranded\/\fR .PP \fB\-\-validate\-tileset\fR=\fI\,x=purgeunused=gitdelete\/\fR .IP @@ -230,7 +230,7 @@ validation to delete extra files in the tileset that .IP are not used. .IP -example: zetaglest \fB\-\-validate\-tileset\fR=\fI\,desert2\/\fR +example: glest \fB\-\-validate\-tileset\fR=\fI\,desert2\/\fR .PP \fB\-\-translate\-techtrees\fR=\fI\,x\/\fR .IP @@ -244,7 +244,7 @@ Where x is a techtree name. .IP Where x is an optional name filter. .IP -example: zetaglest \fB\-\-list\-maps\fR=\fI\,island\/\fR* +example: glest \fB\-\-list\-maps\fR=\fI\,island\/\fR* .PP \fB\-\-list\-techtrees\fR=\fI\,showfactions\/\fR .IP @@ -254,43 +254,43 @@ Where 'showfactions' is an optional parameter to display .IP factions in each techtree. .IP -example: zetaglest \fB\-\-list\-techtrees\fR=\fI\,showfactions\/\fR +example: glest \fB\-\-list\-techtrees\fR=\fI\,showfactions\/\fR .PP \fB\-\-list\-scenarios\fR=\fI\,x\/\fR Display a list of game content: scenarios. .IP Where x is an optional name filter. .IP -example: zetaglest \fB\-\-list\-scenarios\fR=\fI\,beginner\/\fR* +example: glest \fB\-\-list\-scenarios\fR=\fI\,beginner\/\fR* .PP \fB\-\-list\-tilesets\fR=\fI\,x\/\fR Display a list of game content: tilesets. .IP Where x is an optional name filter. .IP -example: zetaglest \fB\-\-list\-tilesets\fR=\fI\,f\/\fR* +example: glest \fB\-\-list\-tilesets\fR=\fI\,f\/\fR* .PP \fB\-\-list\-tutorials\fR=\fI\,x\/\fR Display a list of game content: tutorials. .IP Where x is an optional name filter. .IP -example: zetaglest \fB\-\-list\-tutorials=\fR* +example: glest \fB\-\-list\-tutorials=\fR* .PP \fB\-\-data\-path\fR=\fI\,x\/\fR Sets the game data path to x. .IP example: .IP -zetaglest \fB\-\-data\-path=\fR/usr/local/game_data/ +glest \fB\-\-data\-path=\fR/usr/local/game_data/ .PP \fB\-\-ini\-path\fR=\fI\,x\/\fR Sets the game ini path to x. .IP -example: zetaglest \fB\-\-ini\-path=\fR~/game_config/ +example: glest \fB\-\-ini\-path=\fR~/game_config/ .PP \fB\-\-log\-path\fR=\fI\,x\/\fR Sets the game logs path to x. .IP -example: zetaglest \fB\-\-log\-path=\fR~/game_logs/ +example: glest \fB\-\-log\-path=\fR~/game_logs/ .PP \fB\-\-font\-path\fR=\fI\,x\/\fR Sets the game fonts path to x. .IP -example: zetaglest \fB\-\-font\-path=\fR~/myfonts/ +example: glest \fB\-\-font\-path=\fR~/myfonts/ .PP \fB\-\-show\-ini\-settings\fR=\fI\,x\/\fR Display merged ini settings information. .IP @@ -300,7 +300,7 @@ shows all). .IP example: .IP -zetaglest \fB\-\-show\-ini\-settings\fR=\fI\,DebugMode\/\fR +glest \fB\-\-show\-ini\-settings\fR=\fI\,DebugMode\/\fR .PP \fB\-\-convert\-models\fR=\fI\,x=textureformat=keepsmallest\/\fR .IP @@ -322,7 +322,7 @@ converted format. .IP example: .IP -zetaglest \fB\-\-convert\-models\fR=\fI\,techs\/\fR/zetapack/factions/tech/ +glest \fB\-\-convert\-models\fR=\fI\,techs\/\fR/factionpack/factions/tech/ .IP units/castle/models/castle.g3d=png=keepsmallest .PP @@ -330,33 +330,33 @@ units/castle/models/castle.g3d=png=keepsmallest .IP by x. Where x is a language filename or ISO639\-1 code. .IP -example: zetaglest \fB\-\-use\-language\fR=\fI\,english\/\fR +example: glest \fB\-\-use\-language\fR=\fI\,english\/\fR .IP -example: zetaglest \fB\-\-use\-language\fR=\fI\,en\/\fR +example: glest \fB\-\-use\-language\fR=\fI\,en\/\fR .PP \fB\-\-show\-map\-crc\fR=\fI\,x\/\fR Show the calculated CRC for the map named x. .IP Where x is a map name. .IP -example: zetaglest \fB\-\-show\-map\-crc\fR=\fI\,four_rivers\/\fR +example: glest \fB\-\-show\-map\-crc\fR=\fI\,four_rivers\/\fR .PP \fB\-\-show\-tileset\-crc\fR=\fI\,x\/\fR Show the calculated CRC for the tileset named x. .IP Where x is a tileset name. .IP -example: zetaglest \fB\-\-show\-tileset\-crc\fR=\fI\,forest\/\fR +example: glest \fB\-\-show\-tileset\-crc\fR=\fI\,forest\/\fR .PP \fB\-\-show\-techtree\-crc\fR=\fI\,x\/\fR Show the calculated CRC for the techtree named x. .IP Where x is a techtree name. .IP -example: zetaglest \fB\-\-show\-techtree\-crc\fR=\fI\,zetapack\/\fR +example: glest \fB\-\-show\-techtree\-crc\fR=\fI\,factionpack\/\fR .PP \fB\-\-show\-scenario\-crc\fR=\fI\,x\/\fR Show the calculated CRC for the scenario named x. .IP Where x is a scenario name. .IP -example: zetaglest \fB\-\-show\-scenario\-crc\fR=\fI\,storming\/\fR +example: glest \fB\-\-show\-scenario\-crc\fR=\fI\,storming\/\fR .PP \fB\-\-show\-path\-crc\fR=\fI\,x=y\/\fR Show the calculated CRC for files in the path .IP @@ -364,7 +364,7 @@ located in x using file filter y. .IP Where x is a path name and y is file(s) filter. .IP -example: zetaglest \fB\-\-show\-path\-crc\fR=\fI\,techs\/\fR/=zetapack.7z +example: glest \fB\-\-show\-path\-crc\fR=\fI\,techs\/\fR/=factionpack.7z .PP \fB\-\-disable\-backtrace\fR Disables stack backtrace on errors. .PP @@ -386,7 +386,7 @@ Disables interpolating animations to make them smoother. .IP Where x is a string with the following format: 'width x height'. .IP -example: zetaglest \fB\-\-resolution\fR=\fI\,1024x768\/\fR +example: glest \fB\-\-resolution\fR=\fI\,1024x768\/\fR .PP \fB\-\-colorbits\fR=\fI\,x\/\fR Override the video colorbits. .IP @@ -394,7 +394,7 @@ Where x is a valid colorbits value supported by your video .IP driver. .IP -example: zetaglest \fB\-\-colorbits\fR=\fI\,32\/\fR +example: glest \fB\-\-colorbits\fR=\fI\,32\/\fR .PP \fB\-\-depthbits\fR=\fI\,x\/\fR Override the video depthbits. .IP @@ -402,19 +402,19 @@ Where x is a valid depthbits value supported by your video .IP driver. .IP -example: zetaglest \fB\-\-depthbits\fR=\fI\,24\/\fR +example: glest \fB\-\-depthbits\fR=\fI\,24\/\fR .PP \fB\-\-fullscreen\fR=\fI\,x\/\fR Override the video fullscreen mode. .IP Where x either true or false. .IP -example: zetaglest \fB\-\-fullscreen\fR=\fI\,true\/\fR +example: glest \fB\-\-fullscreen\fR=\fI\,true\/\fR .PP \fB\-\-set\-gamma\fR=\fI\,x\/\fR Override the video gamma (contrast) value. .IP Where x is a floating point value. .IP -example: zetaglest \fB\-\-set\-gamma\fR=\fI\,1\/\fR.5 +example: glest \fB\-\-set\-gamma\fR=\fI\,1\/\fR.5 .PP \fB\-\-use\-font\fR=\fI\,x\/\fR Override the font to use. .IP @@ -424,13 +424,13 @@ freetype2. .IP example: .IP -zetaglest \fB\-\-use\-font=\fR$APPLICATIONDATAPATH/data/core/fonts/Vera.ttf +glest \fB\-\-use\-font=\fR$APPLICATIONDATAPATH/data/core/fonts/Vera.ttf .PP \fB\-\-font\-basesize\fR=\fI\,x\/\fR Override the font base size. .IP Where x is the numeric base font size to use. .IP -example: zetaglest \fB\-\-font\-basesize\fR=\fI\,5\/\fR +example: glest \fB\-\-font\-basesize\fR=\fI\,5\/\fR .PP \fB\-\-disable\-videos\fR Disables video playback. .PP @@ -450,7 +450,7 @@ techtrees, tilesets or all. .IP Where y = include_main to include main (non mod) data. .IP -example: zetaglest \fB\-\-create\-data\-archives\fR=\fI\,all\/\fR +example: glest \fB\-\-create\-data\-archives\fR=\fI\,all\/\fR .PP \fB\-\-steam\fR=\fI\,x=y\/\fR .IP diff --git a/man/glest_editor.6 b/man/glest_editor.6 new file mode 100644 index 000000000..a8f517029 --- /dev/null +++ b/man/glest_editor.6 @@ -0,0 +1,12 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. +.TH GLEST_EDITOR "6" "September 2018" "glest_editor" "Games" +.SH NAME +glest_editor \- Map\ editor\ for\ the\ popular\ 3D\ realtime\ strategy\ game +.SH DESCRIPTION +Glest map editor v0.8.01 [Using wxWidgets 3.0.2] +.PP +Creates or edits glest/glest maps. [.mgm/.gbm] +.PP +Draw with left mouse button. +Move map with right mouse button. +Zoom with middle mouse button or mousewheel. diff --git a/man/zetaglest_g3dviewer.6 b/man/glest_g3dviewer.6 similarity index 74% rename from man/zetaglest_g3dviewer.6 rename to man/glest_g3dviewer.6 index 43da38fe2..832fa6215 100644 --- a/man/zetaglest_g3dviewer.6 +++ b/man/glest_g3dviewer.6 @@ -1,11 +1,11 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. -.TH ZETAGLEST_G3DVIEWER "6" "September 2018" "zetaglest_g3dviewer" "Games" +.TH GLEST_G3DVIEWER "6" "September 2018" "glest_g3dviewer" "Games" .SH NAME -zetaglest_g3dviewer \- G3D\ Model\ editor\ for\ the\ popular\ 3D\ realtime\ strategy\ game +glest_g3dviewer \- G3D\ Model\ editor\ for\ the\ popular\ 3D\ realtime\ strategy\ game .SH DESCRIPTION Using wxWidgets version [3.0.2.0] .PP -zetaglest_g3dviewer v0.8.01, [Using wxWidgets 3.0.2] +glest_g3dviewer v0.8.01, [Using wxWidgets 3.0.2] .PP Displays glest 3D\-models and unit/projectile/splash particle systems. .PP @@ -13,7 +13,7 @@ Rotate with left mouse button. Zoom with right mouse button or mousewheel. Use ctrl to load more than one particle system. Press R to restart particles, this also reloads all files if they are changed. .PP -zetaglest_g3dviewer [G3D FILE], usage +glest_g3dviewer [G3D FILE], usage .PP Commandline Parameter: Description: .PP @@ -31,7 +31,7 @@ comma and one or more skill names to try loading. .IP example: .IP -zetaglest_g3dviewer \fB\-\-load\-unit\fR=\fI\,techs\/\fR/zetapack/factions/ +glest_g3dviewer \fB\-\-load\-unit\fR=\fI\,techs\/\fR/factionpack/factions/ .IP tech/units/battle_machine,attack_skill,stop_skill .PP @@ -41,7 +41,7 @@ Where x is a g3d filename to load. .IP example: .IP -zetaglest_g3dviewer \fB\-\-load\-model\fR=\fI\,techs\/\fR/zetapack/factions/ +glest_g3dviewer \fB\-\-load\-model\fR=\fI\,techs\/\fR/factionpack/factions/ .IP tech/units/battle_machine/models/battle_machine_dying.g3d .PP @@ -53,7 +53,7 @@ Where x is a decimal value from \fB\-1\fR.0 to 1.0 .IP example: .IP -zetaglest_g3dviewer \fB\-\-load\-model\-animation\-value\fR=\fI\,0\/\fR.5 +glest_g3dviewer \fB\-\-load\-model\-animation\-value\fR=\fI\,0\/\fR.5 .PP \fB\-\-auto\-screenshot\fR=\fI\,x\/\fR Automatically takes a screenshot of the items you .IP @@ -71,11 +71,11 @@ disable_normals, saveas\-, resize\-wxh .IP example: .IP -zetaglest_g3dviewer \fB\-\-auto\-screenshot\fR=\fI\,transparent\/\fR, +glest_g3dviewer \fB\-\-auto\-screenshot\fR=\fI\,transparent\/\fR, .IP disable_grid,saveas\-test.png,resize\-800x600 .IP -\fB\-\-load\-model\fR=\fI\,techs\/\fR/zetapack/factions/tech/units/ +\fB\-\-load\-model\fR=\fI\,techs\/\fR/factionpack/factions/tech/units/ .IP battle_machine/models/battle_machine_dying.g3d .PP @@ -85,7 +85,7 @@ Where x is a Particle XML filename to load. .IP example: .IP -zetaglest_g3dviewer \fB\-\-load\-particle\fR=\fI\,techs\/\fR/zetapack/factions/ +glest_g3dviewer \fB\-\-load\-particle\fR=\fI\,techs\/\fR/factionpack/factions/ .IP persian/units/genie/glow_particles.xml .PP @@ -101,7 +101,7 @@ filename to load. .IP example: .IP -zetaglest_g3dviewer \fB\-\-load\-projectile\-particle\fR=\fI\,techs\/\fR/zetapack/ +glest_g3dviewer \fB\-\-load\-projectile\-particle\fR=\fI\,techs\/\fR/factionpack/ .IP factions/persian/units/genie/particle_proj.xml .PP @@ -117,7 +117,7 @@ filename to load. .IP example: .IP -zetaglest_g3dviewer \fB\-\-load\-splash\-particle\fR=\fI\,techs\/\fR/zetapack/ +glest_g3dviewer \fB\-\-load\-splash\-particle\fR=\fI\,techs\/\fR/factionpack/ .IP factions/persian/units/genie/particle_splash.xml .PP @@ -131,7 +131,7 @@ Where x is an integer value from 1 to particle count. .IP example: .IP -zetaglest_g3dviewer \fB\-\-load\-particle\-loop\-value\fR=\fI\,25\/\fR +glest_g3dviewer \fB\-\-load\-particle\-loop\-value\fR=\fI\,25\/\fR .PP \fB\-\-zoom\-value\fR=\fI\,x\/\fR Zoom value when loading a model. .IP @@ -139,7 +139,7 @@ Where x is a decimal value from 0.1 to 10.0 .IP example: .IP -zetaglest_g3dviewer \fB\-\-zoom\-value\fR=\fI\,4\/\fR.2 +glest_g3dviewer \fB\-\-zoom\-value\fR=\fI\,4\/\fR.2 .PP \fB\-\-rotate\-x\-value\fR=\fI\,x\/\fR X Coordinate Rotation value when loading a model. .IP @@ -147,7 +147,7 @@ Where x is a decimal value from \fB\-10\fR.0 to 10.0 .IP example: .IP -zetaglest_g3dviewer \fB\-\-rotate\-x\-value\fR=\fI\,2\/\fR.2 +glest_g3dviewer \fB\-\-rotate\-x\-value\fR=\fI\,2\/\fR.2 .PP \fB\-\-rotate\-y\-value\fR=\fI\,x\/\fR Y Coordinate Rotation value when loading a model. .IP @@ -155,7 +155,7 @@ Where x is a decimal value from \fB\-10\fR.0 to 10.0 .IP example: .IP -zetaglest_g3dviewer \fB\-\-rotate\-y\-value\fR=\fI\,2\/\fR.2 +glest_g3dviewer \fB\-\-rotate\-y\-value\fR=\fI\,2\/\fR.2 .PP \fB\-\-screenshot\-format\fR=\fI\,x\/\fR Specify which image format to use for screenshots. .IP @@ -167,4 +167,4 @@ png,jpg,tga,bmp .IP example: .IP -zetaglest_g3dviewer \fB\-\-screenshot\-format\fR=\fI\,jpg\/\fR +glest_g3dviewer \fB\-\-screenshot\-format\fR=\fI\,jpg\/\fR diff --git a/man/zetaglest_editor.6 b/man/zetaglest_editor.6 deleted file mode 100644 index 6d2875b4a..000000000 --- a/man/zetaglest_editor.6 +++ /dev/null @@ -1,12 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. -.TH ZETAGLEST_EDITOR "6" "September 2018" "zetaglest_editor" "Games" -.SH NAME -zetaglest_editor \- Map\ editor\ for\ the\ popular\ 3D\ realtime\ strategy\ game -.SH DESCRIPTION -ZetaGlest map editor v0.8.01 [Using wxWidgets 3.0.2] -.PP -Creates or edits zetaglest/glest maps. [.mgm/.gbm] -.PP -Draw with left mouse button. -Move map with right mouse button. -Zoom with middle mouse button or mousewheel. diff --git a/mk/cmake/Modules/ReqVersAndStaticConf.cmake b/mk/cmake/Modules/ReqVersAndStaticConf.cmake index 61c02805a..3f6aa0be7 100644 --- a/mk/cmake/Modules/ReqVersAndStaticConf.cmake +++ b/mk/cmake/Modules/ReqVersAndStaticConf.cmake @@ -8,7 +8,7 @@ # IF(WANT_STATIC_LIBS) - IF(BUILD_ZETAGLEST_MODEL_VIEWER OR BUILD_ZETAGLEST_MAP_EDITOR OR BUILD_ZETAGLEST) + IF(BUILD_GLEST_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_GLEST) # shared lib FOREACH(STATIC_LIB OpenSSL @@ -26,7 +26,7 @@ IF(WANT_STATIC_LIBS) LIST(APPEND LIST_OF_STATIC_LIBS_MG "${STATIC_LIB}") ENDFOREACH() ENDIF() - IF(BUILD_ZETAGLEST_MODEL_VIEWER OR BUILD_ZETAGLEST_MAP_EDITOR) + IF(BUILD_GLEST_MODEL_VIEWER OR BUILD_MAP_EDITOR) # wxWidgets for tools FOREACH(STATIC_LIB wxWidgets) @@ -38,7 +38,7 @@ IF(WANT_STATIC_LIBS) # wxWidgets by default are not available static ENDIF() ENDIF() - IF(BUILD_ZETAGLEST) + IF(BUILD_GLEST) # only libs not used by shared lib FOREACH(STATIC_LIB OGG) diff --git a/mk/linux/.gitignore b/mk/linux/.gitignore index af011f75c..304b2a973 100644 --- a/mk/linux/.gitignore +++ b/mk/linux/.gitignore @@ -1,8 +1,8 @@ -/zetaglest -/zetaglest.6 -/zetaglest_editor* -/zetaglest_g3dviewer* -/zetaglest_tests +/glest +/glest.6 +/glest_editor* +/glest_g3dviewer* +/glest_tests !/*.desktop diff --git a/mk/linux/build-deps.sh b/mk/linux/build-deps.sh index dfd2c7c53..2db50de60 100755 --- a/mk/linux/build-deps.sh +++ b/mk/linux/build-deps.sh @@ -3,7 +3,7 @@ # Use this script to install build dependencies on a number of Linux platforms # ---------------------------------------------------------------------------- # Originally written by Mark Vejvoda -# Rewritten by Tom Reynolds +# Rewritten by Tom Reynolds # Copyright (c) 2012-2017 Mark Vejvoda, Tom Reynolds under GNU GPL v3.0 LANG=C @@ -59,7 +59,7 @@ fi common_info() { echo if [ "$1" != "no_install" ]; then - echo 'Please report a bug at https://github.com/ZetaGlest/zetaglest-source providing the following information:' + echo 'Please report a bug at https://github.com/Glest/glest-source providing the following information:' fi echo '--- snip ---' echo 'Git revision: '"$gitcommit" @@ -71,8 +71,8 @@ common_info() { echo '--- snip ---' echo if [ "$1" = "+wiki" ]; then - echo 'For now, you may want to take a look at the build hints on the ZetaGlest readme at:' - echo ' https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md' + echo 'For now, you may want to take a look at the build hints on the Glest readme at:' + echo ' https://github.com/Glest/glest-source/blob/develop/BUILD.md' echo 'If you can come up with something which works for you, please report back to us, too. Thanks!' exit 1 fi diff --git a/mk/linux/build-zg-nodeps.sh b/mk/linux/build-nodeps.sh old mode 100755 new mode 100644 similarity index 97% rename from mk/linux/build-zg-nodeps.sh rename to mk/linux/build-nodeps.sh index daa58c796..fb55060b7 --- a/mk/linux/build-zg-nodeps.sh +++ b/mk/linux/build-nodeps.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Use this script to build ZetaGlest using cmake +# Use this script to build Glest using cmake # ---------------------------------------------------------------------------- # Written by Mark Vejvoda # Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+ @@ -9,7 +9,7 @@ # Configuration section # -echo "Building ZetaGlest..." +echo "Building Glest..." echo # Default to English language output so we can understand your bug reports @@ -120,7 +120,7 @@ cd ${SCRIPTDIR} # The default configuration works fine for regular developers and is also used # by our installers. # For more cmake/build options refer to -# https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md +# https://github.com/Glest/glest-source/blob/develop/BUILD.md EXTRA_CMAKE_OPTIONS= # Build threads @@ -328,6 +328,6 @@ else echo '' echo 'BUILD COMPLETE.' echo '' - echo 'The ZetaGlest executable can be found using the following path:' - echo ' zetaglest/mk/linux/build/zetaglest' + echo 'The Glest executable can be found using the following path:' + echo ' glest/mk/linux/build/glest' fi diff --git a/mk/linux/build-zg.sh b/mk/linux/build.sh old mode 100755 new mode 100644 similarity index 82% rename from mk/linux/build-zg.sh rename to mk/linux/build.sh index 5f79229d7..2c26758bd --- a/mk/linux/build-zg.sh +++ b/mk/linux/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Use this script to build ZetaGlest using cmake +# Use this script to build Glest using cmake # ---------------------------------------------------------------------------- # Written by Mark Vejvoda # Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+ @@ -9,5 +9,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" cd $DIR ./build-deps.sh echo -./build-zg-nodeps.sh +./build-nodeps.sh cd $currentDir \ No newline at end of file diff --git a/mk/linux/clone-data.sh b/mk/linux/clone-data.sh index c8f25e55d..0789f3241 100755 --- a/mk/linux/clone-data.sh +++ b/mk/linux/clone-data.sh @@ -6,7 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" cd $DIR mkdir build cd build -git clone https://github.com/ZetaGlest/zetaglest-data.git data --branch 1.0 +git clone https://github.com/Glest/glest-data.git data --branch 1.0 cd .. if [ `id -u`'x' == '0x' ] || [ "$1" == "--manually" ]; then diff --git a/mk/linux/detect-system.sh b/mk/linux/detect-system.sh index d8e4faa75..46dfd95cd 100755 --- a/mk/linux/detect-system.sh +++ b/mk/linux/detect-system.sh @@ -2,7 +2,7 @@ # # Functions shared by several scripts # -# Copyright (c) 2013-2018 ZetaGlest Team under GNU GPL v3.0+ +# Copyright (c) 2013-2018 Glest Team under GNU GPL v3.0+ function detect_system { # Determine distro title, release, codename diff --git a/mk/linux/setup.sh b/mk/linux/setup.sh index f6eda9056..dfe0ec32d 100755 --- a/mk/linux/setup.sh +++ b/mk/linux/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash echo -echo "Initializing ZetaGlest setup..." +echo "Initializing Glest setup..." currentDir=$PWD DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" cd $DIR @@ -8,5 +8,5 @@ cd $DIR echo ./pull.sh echo -./build-zg.sh +./build.sh cd $currentDir \ No newline at end of file diff --git a/mk/linux/start_zetaglest_gameserver b/mk/linux/start_glest_gameserver old mode 100755 new mode 100644 similarity index 98% rename from mk/linux/start_zetaglest_gameserver rename to mk/linux/start_glest_gameserver index 6df0f0891..9f81b9a57 --- a/mk/linux/start_zetaglest_gameserver +++ b/mk/linux/start_glest_gameserver @@ -22,7 +22,7 @@ # the next user who connects (or had already connected) takes control. # # ---------------------------------------------------------------------------- -# 2013 Written by Tom Reynolds +# 2013 Written by Tom Reynolds # 2015 Rewritten by filux # Copyright (c) 2013-2017 under GNU GPL v3.0+ # ---------------------------------------------------------------------------- @@ -40,11 +40,11 @@ B_SCRIPT_DIR="$GAMEDIR" # ------- # useful for mods -BASIC_SCRIPT="start_zetaglest" -FAKE_EXC_BINARY_MAC="ZetaGlest" -EXC_BINARY="zetaglest" -EXC_BINARY_DISTRO="zetaglest" -SHORT_GAME_NAME="zetaglest" +BASIC_SCRIPT="start_glest" +FAKE_EXC_BINARY_MAC="Glest" +EXC_BINARY="glest" +EXC_BINARY_DISTRO="glest" +SHORT_GAME_NAME="glest" # ------- PORTSTART=62001 NUM_OM_SERVERS=2 diff --git a/mk/linux/tools-for-standalone-client/start_zetaglest b/mk/linux/tools-for-standalone-client/start_glest old mode 100755 new mode 100644 similarity index 98% rename from mk/linux/tools-for-standalone-client/start_zetaglest rename to mk/linux/tools-for-standalone-client/start_glest index 2f5bf5cd5..f0a746516 --- a/mk/linux/tools-for-standalone-client/start_zetaglest +++ b/mk/linux/tools-for-standalone-client/start_glest @@ -9,20 +9,20 @@ LANG=C SCRIPTLOCATION="$(readlink -f "$0")" GAMEDIR="$(dirname "$SCRIPTLOCATION")" ARCHITECTURE="$(uname -m | tr '[A-Z]' '[a-z]')" -BugReportEngine="https://github.com/ZetaGlest/zetaglest-source/issues" -BugReportBoth="https://github.com/ZetaGlest" +BugReportEngine="https://github.com/Glest/glest-source/issues" +BugReportBoth="https://github.com/Glest" # ------- # useful for mods BugReportBoth2="$BugReportBoth" -BugReportData="https://github.com/ZetaGlest/zetaglest-data/issues" +BugReportData="https://github.com/Glest/glest-data/issues" -EXC_BINARY="zetaglest" -if [ -f "${GAMEDIR}/zetaglest_shim" ]; then EXC_BINARY="zetaglest_shim" +EXC_BINARY="glest" +if [ -f "${GAMEDIR}/glest_shim" ]; then EXC_BINARY="glest_shim" -SHORT_GAME_NAME="zetaglest" +SHORT_GAME_NAME="glest" # if long game name contain spaces then write it inside quotes # e.g. "\"long name with spaces\"" -LONG_GAME_NAME="ZetaGlest" +LONG_GAME_NAME="Glest" # ------- LIBDIR="lib"; ExitStatus=0; LibsWarnings=""; IgnoredLibs=""; FirstLnError="" diff --git a/mk/linux/tools-for-standalone-client/start_zetaglest_g3dviewer b/mk/linux/tools-for-standalone-client/start_glest_g3dviewer old mode 100755 new mode 100644 similarity index 91% rename from mk/linux/tools-for-standalone-client/start_zetaglest_g3dviewer rename to mk/linux/tools-for-standalone-client/start_glest_g3dviewer index ea6dcdf69..0ab470c7d --- a/mk/linux/tools-for-standalone-client/start_zetaglest_g3dviewer +++ b/mk/linux/tools-for-standalone-client/start_glest_g3dviewer @@ -8,8 +8,8 @@ SCRIPTLOCATION="$(readlink -f "$0")" GAMEDIR="$(dirname "$SCRIPTLOCATION")" # ------- # useful for mods -EXC_BINARY="zetaglest_g3dviewer" -BASIC_SCRIPT="start_zetaglest" +EXC_BINARY="glest_g3dviewer" +BASIC_SCRIPT="start_glest" # ------- LIBDIR="lib" WARNINGS="$("$GAMEDIR/$BASIC_SCRIPT" --tool-g3dviewer "$EXC_BINARY" 2>&1)" diff --git a/mk/linux/tools-for-standalone-client/start_zetaglest_mapeditor b/mk/linux/tools-for-standalone-client/start_glest_mapeditor old mode 100755 new mode 100644 similarity index 91% rename from mk/linux/tools-for-standalone-client/start_zetaglest_mapeditor rename to mk/linux/tools-for-standalone-client/start_glest_mapeditor index 78070d098..8f30ee1d9 --- a/mk/linux/tools-for-standalone-client/start_zetaglest_mapeditor +++ b/mk/linux/tools-for-standalone-client/start_glest_mapeditor @@ -8,8 +8,8 @@ SCRIPTLOCATION="$(readlink -f "$0")" GAMEDIR="$(dirname "$SCRIPTLOCATION")" # ------- # useful for mods -EXC_BINARY="zetaglest_editor" -BASIC_SCRIPT="start_zetaglest" +EXC_BINARY="glest_editor" +BASIC_SCRIPT="start_glest" # ------- LIBDIR="lib" WARNINGS="$("$GAMEDIR/$BASIC_SCRIPT" --tool-editor "$EXC_BINARY" 2>&1)" diff --git a/mk/macos/.gitignore b/mk/macos/.gitignore index 50af2085a..62f5153e8 100644 --- a/mk/macos/.gitignore +++ b/mk/macos/.gitignore @@ -1,6 +1,6 @@ -/megaglest -/megaglest.6 -/megaglest_* +/glest +/glest.6 +/glest_* /[Mm]ega[Gg]lest*.dmg core diff --git a/mk/macos/CMakeLists.txt b/mk/macos/CMakeLists.txt index face777cb..caa9eb60d 100644 --- a/mk/macos/CMakeLists.txt +++ b/mk/macos/CMakeLists.txt @@ -36,8 +36,8 @@ include (InstallRequiredSystemLibraries) # Use bundle generator (OSX has 3 other options if you feel adventurous) SET(CPACK_GENERATOR "Bundle") -SET(CPACK_BUNDLE_NAME "ZetaGlest") -SET(CPACK_PACKAGE_FILE_NAME "ZetaGlest-game-macos-${ZETAGLEST_VERSION}") -SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.icns") -SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.icns") -SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.sh") +SET(CPACK_BUNDLE_NAME "Glest") +SET(CPACK_PACKAGE_FILE_NAME "Glest-game-macos-${GLEST_VERSION}") +SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/Glest.icns") +SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/Glest.icns") +SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/Glest.sh") diff --git a/mk/macos/build-zg.sh b/mk/macos/build.sh old mode 100755 new mode 100644 similarity index 87% rename from mk/macos/build-zg.sh rename to mk/macos/build.sh index 4579ae191..d00224a5d --- a/mk/macos/build-zg.sh +++ b/mk/macos/build.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Use this script to build MegaGlest using cmake +# Use this script to build Glest using cmake # ---------------------------------------------------------------------------- # 2011 Written by Mark Vejvoda # 2015 Rewritten by filux @@ -7,7 +7,7 @@ # ---------------------------------------------------------------------------- # Default to English language output so we can understand your bug reports # -# Modified by Andy Alt for ZetaGlest +# Modified by Andy Alt for Glest export LANG=C @@ -77,17 +77,17 @@ cd ${SCRIPTDIR} if [ "$BUILD_BUNDLE" -eq "1" ] && [ -d "p7zip" ]; then rm -rf "p7zip"; fi if [ -e ".p7zip.zip" ] && [ "$(find ./ -name ".p7zip.zip" -mtime +90)" ]; then rm ".p7zip.zip"; rm -rf "p7zip"; fi if [ ! -e ".p7zip.zip" ]; then - curl -L -o .p7zip.zip https://github.com/MegaGlest/megaglest-source/releases/download/3.3.0/p7zip.zip 2>/dev/null + curl -L -o .p7zip.zip https://github.com/Glest/glest-source/releases/download/3.3.0/p7zip.zip 2>/dev/null # ^sha256: 20ac3b0377054f8196c10e569bd6ec7c6ed06d519fa39e781ee6d27d7887588b if [ -e ".p7zip.zip" ]; then touch -m ".p7zip.zip"; fi fi if [ ! -d "p7zip" ]; then unzip .p7zip.zip >/dev/null; fi if [ "$BUILD_BUNDLE" -eq "1" ]; then - if [ -e "zetaglest" ] && [ "$(./zetaglest --version >/dev/null; echo "$?")" -eq "0" ]; then + if [ -e "glest" ] && [ "$(./glest --version >/dev/null; echo "$?")" -eq "0" ]; then if [ -d "lib" ]; then rm -rf "lib"; fi mkdir -p "lib" - list_of_libs="$(otool -L zetaglest | grep -v '/System/Library/Frameworks/' | grep -v '/usr/lib/' | awk '{print $1}' | sed '/:$/d')" + list_of_libs="$(otool -L glest | grep -v '/System/Library/Frameworks/' | grep -v '/usr/lib/' | awk '{print $1}' | sed '/:$/d')" for (( i=1; i<=50; i++ )); do for dyn_lib in $list_of_libs; do if [ "$(echo "$list_of_checked_libs" | grep "$dyn_lib")" = "" ]; then @@ -113,7 +113,7 @@ $list_of_libs2" | sed '/:$/d' | sed '/^$/d' | sort -u )" fi fi else - echo 'Error: Please run first at least once build-mg.sh script to be ready for prepare directory with dynamic libraries.' + echo 'Error: Please run first at least once build.sh script to be ready for prepare directory with dynamic libraries.' # strange method but required for cpack/.dmg exit 1 fi @@ -201,15 +201,15 @@ if [ "$MAKE_ONLY" -eq "0" ]; then EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=''" if [ "$GCC_FORCED" -ne "1" ] || [ "$USE_XCODE" -eq "1" ]; then : #^ Remove this condition when it V will start working on gcc - #EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_ZETAGLEST_TESTS=ON" + #EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_GLEST_TESTS=ON" #^ Uncomment when it will start working on clang else - rm -f ../zetaglest_tests + rm -f ../glest_tests fi - rm -f ../ZetaGlest*.dmg + rm -f ../Glest*.dmg else EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCPACK_GENERATOR=Bundle -DWANT_SINGLE_INSTALL_DIRECTORY=ON" - rm -f ../zetaglest_editor ../zetaglest_g3dviewer ../zetaglest_tests + rm -f ../glest_editor ../glest_g3dviewer ../glest_tests fi echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}" if [ "$USE_XCODE" -eq "1" ]; then @@ -234,8 +234,8 @@ else if [ "$?" -ne "0" ]; then echo 'ERROR: MAKE failed.' >&2; exit 2; fi fi - if [ -d "../Debug" ]; then mv -f ../Debug/zetaglest* "$SCRIPTDIR"; rm -rf ../Debug - elif [ -d "../Release" ]; then mv -f ../Release/zetaglest* "$SCRIPTDIR"; rm -rf ../Release; fi + if [ -d "../Debug" ]; then mv -f ../Debug/glest* "$SCRIPTDIR"; rm -rf ../Debug + elif [ -d "../Release" ]; then mv -f ../Release/glest* "$SCRIPTDIR"; rm -rf ../Release; fi cd .. if [ "$BUILD_BUNDLE" -ne "1" ]; then @@ -244,23 +244,23 @@ else echo '' echo '- - - - - - - - - - - - - - - - - - - -' echo 'Mini test:' - echo '>>> zetaglest --version' - ./zetaglest --version | head -3 - #echo '>>> zetaglest_editor --help' - #./zetaglest_editor --help | head -3 - #echo '>>> zetaglest_g3dviewer --help' - #./zetaglest_g3dviewer --help | head -3 + echo '>>> glest --version' + ./glest --version | head -3 + #echo '>>> glest_editor --help' + #./glest_editor --help | head -3 + #echo '>>> glest_g3dviewer --help' + #./glest_g3dviewer --help | head -3 echo 'Dependencies:' - otool -L zetaglest + otool -L glest echo '- - - - - - - - - - - - - - - - - - - -' echo '' - echo 'To launch ZetaGlest from the current directory, use:' - echo ' ./zetaglest' + echo 'To launch Glest from the current directory, use:' + echo ' ./glest' echo '' else - ls -lhA zetaglest + ls -lhA glest echo '' - ./zetaglest --version + ./glest --version echo '' fi fi diff --git a/mk/macos/bundle_resources/ZetaGlest.icns b/mk/macos/bundle_resources/Glest.icns similarity index 100% rename from mk/macos/bundle_resources/ZetaGlest.icns rename to mk/macos/bundle_resources/Glest.icns diff --git a/mk/macos/bundle_resources/ZetaGlest.sh b/mk/macos/bundle_resources/Glest.sh similarity index 81% rename from mk/macos/bundle_resources/ZetaGlest.sh rename to mk/macos/bundle_resources/Glest.sh index f452dbc62..5111046fd 100644 --- a/mk/macos/bundle_resources/ZetaGlest.sh +++ b/mk/macos/bundle_resources/Glest.sh @@ -10,9 +10,9 @@ if [ -d "$SCRIPTDIR/lib" ]; then binary_dir_path="$SCRIPTDIR" else export DYLD_LIBRARY_PATH="$SCRIPTDIR/../Frameworks" - binary_dir_path="$SCRIPTDIR/../Resources/zetaglest-game" + binary_dir_path="$SCRIPTDIR/../Resources/glest-game" fi export PATH="$binary_dir_path:$PATH" -exec "$binary_dir_path/zetaglest" "$@" +exec "$binary_dir_path/glest" "$@" exit "$?" diff --git a/mk/macos/bundle_resources/Info.plist.in b/mk/macos/bundle_resources/Info.plist.in index f7384baeb..f7b2be239 100644 --- a/mk/macos/bundle_resources/Info.plist.in +++ b/mk/macos/bundle_resources/Info.plist.in @@ -5,17 +5,17 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ZetaGlest + Glest CFBundleGetInfoString - v${ZETAGLEST_VERSION}, © 2018 The ZetaGlest Team. + v${GLEST_VERSION}, © 2018 The Glest Team. CFBundleIconFile - ZetaGlest + Glest CFBundleIdentifier - org.zetaglest.v${ZETAGLEST_VERSION} + org.glest.v${GLEST_VERSION} CFBundleInfoDictionaryVersion 6.0 CFBundleName - ZetaGlest + Glest CFBundlePackageType APPL CFBundleShortVersionString diff --git a/mk/shared/glest.ico b/mk/shared/glest.ico new file mode 100644 index 000000000..d935df923 Binary files /dev/null and b/mk/shared/glest.ico differ diff --git a/mk/shared/glest.ini b/mk/shared/glest.ini index e48e950f9..873cd622c 100644 --- a/mk/shared/glest.ini +++ b/mk/shared/glest.ini @@ -16,7 +16,7 @@ ConsoleMaxLines=6 ConsoleMaxLinesStored=25 ConsoleTimeout=20 DataPath=$APPLICATIONDATAPATH/ -LogPath=$HOME/.zetaglest/ +LogPath=$HOME/.glest/ DayTime=1000 DebugLogFile=debug.log DebugMode=false @@ -79,5 +79,5 @@ SoundVolumeMusic=90 StencilBits=0 Textures3D=true UnitParticles=true -UserData_Root=$HOME/.zetaglest/ +UserData_Root=$HOME/.glest/ Windowed=false diff --git a/mk/shared/zetaglest.ico b/mk/shared/zetaglest.ico deleted file mode 100644 index 05ba8fcf7..000000000 Binary files a/mk/shared/zetaglest.ico and /dev/null differ diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.bat b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.bat index e8e37b392..e338122ef 100644 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.bat +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.bat @@ -1 +1 @@ -builder\steamcmd.exe +login megaglest_team %1 +run_app_build_http ..\scripts\megaglest_build_windows_578870.vdf +quit +builder\steamcmd.exe +login glest_team %1 +run_app_build_http ..\scripts\glest_build_windows_578870.vdf +quit diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.sh b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.sh index 52c8d0abf..4bd4ce1ad 100755 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.sh +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.sh @@ -3,4 +3,4 @@ STEAMROOT="$(cd "${0%/*}" && echo $PWD)" STEAMCMD=`basename "$0" .sh` -./builder_linux/steamcmd.sh +login megaglest_team $1 +run_app_build_http ../scripts/megaglest_build_linux_578870.vdf +quit +./builder_linux/steamcmd.sh +login glest_team $1 +run_app_build_http ../scripts/glest_build_linux_578870.vdf +quit diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_editor.sh b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_editor.sh index 32a658594..14b749a66 100755 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_editor.sh +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_editor.sh @@ -3,7 +3,7 @@ STEAMROOT="$(cd "${0%/*}" && echo $PWD)" STEAMCMD=`basename "$0" .sh` -cp -p content/linux_x64/megaglest_editor content/editor_linux_x64/ +cp -p content/linux_x64/glest_editor content/editor_linux_x64/ cp -p content/linux_x64/glest.ini content/editor_linux_x64/ -./builder_linux/steamcmd.sh +login megaglest_team $1 +run_app_build_http ../scripts/editor_app_linux_611990.vdf +quit +./builder_linux/steamcmd.sh +login glest_team $1 +run_app_build_http ../scripts/editor_app_linux_611990.vdf +quit diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_win_editor.sh b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_win_editor.sh index 683c5262c..4cc0274d3 100755 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_win_editor.sh +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_win_editor.sh @@ -3,10 +3,10 @@ STEAMROOT="$(cd "${0%/*}" && echo $PWD)" STEAMCMD=`basename "$0" .sh` -cp -p content/win_x86/megaglest_editor.exe content/editor_win_x86/ +cp -p content/win_x86/glest_editor.exe content/editor_win_x86/ cp -p content/win_x86/glest.ini content/editor_win_x86/ -cp -p content/win_x64/megaglest_editorx64.exe content/editor_win_x64/ +cp -p content/win_x64/glest_editorx64.exe content/editor_win_x64/ cp -p content/win_x64/glest.ini content/editor_win_x64/ -./builder_linux/steamcmd.sh +login megaglest_team $1 +run_app_build_http ../scripts/editor_app_win_611990.vdf +quit +./builder_linux/steamcmd.sh +login glest_team $1 +run_app_build_http ../scripts/editor_app_win_611990.vdf +quit diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_linux_611990.vdf b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_linux_611990.vdf index 168eab989..e0cb2b2a8 100644 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_linux_611990.vdf +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_linux_611990.vdf @@ -1,7 +1,7 @@ "appbuild" { "appid" "611990" - "desc" "MegaGlest Editor Linux" // description for this build + "desc" "Glest Editor Linux" // description for this build "buildoutput" "..\output\" // build output folder for .log, .csm & .csd files, relative to location of this file "contentroot" "..\content\" // root content folder, relative to location of this file "setlive" "" // branch to set live after successful build, non if empty diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_win_611990.vdf b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_win_611990.vdf index 25e59a637..d3372ead9 100644 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_win_611990.vdf +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_win_611990.vdf @@ -1,7 +1,7 @@ "appbuild" { "appid" "611990" - "desc" "MegaGlest Editor Windows" // description for this build + "desc" "Glest Editor Windows" // description for this build "buildoutput" "..\output\" // build output folder for .log, .csm & .csd files, relative to location of this file "contentroot" "..\content\" // root content folder, relative to location of this file "setlive" "" // branch to set live after successful build, non if empty diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_linux_578870.vdf b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_linux_578870.vdf similarity index 91% rename from mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_linux_578870.vdf rename to mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_linux_578870.vdf index 5a44d68b5..472474df9 100644 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_linux_578870.vdf +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_linux_578870.vdf @@ -1,7 +1,7 @@ "appbuild" { "appid" "578870" - "desc" "MegaGlest" // description for this build + "desc" "Glest" // description for this build "buildoutput" "..\output\" // build output folder for .log, .csm & .csd files, relative to location of this file "contentroot" "..\content\" // root content folder, relative to location of this file "setlive" "" // branch to set live after successful build, non if empty diff --git a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_windows_578870.vdf b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_windows_578870.vdf similarity index 90% rename from mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_windows_578870.vdf rename to mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_windows_578870.vdf index 5c7b81af1..84afdde12 100644 --- a/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_windows_578870.vdf +++ b/mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_windows_578870.vdf @@ -1,7 +1,7 @@ "appbuild" { "appid" "578870" - "desc" "MegaGlest" // description for this build + "desc" "Glest" // description for this build "buildoutput" "..\output\" // build output folder for .log, .csm & .csd files, relative to location of this file "contentroot" "..\content\" // root content folder, relative to location of this file "setlive" "" // branch to set live after successful build, non if empty diff --git a/mk/windows/README.md b/mk/windows/README.md index 6d704a7d1..7577feab2 100644 --- a/mk/windows/README.md +++ b/mk/windows/README.md @@ -1,10 +1,10 @@ -# Build ZetaGlest for Windows +# Building Glest for Windows -**To build ZetaGlest for the first time:** +**To build Glest for the first time:** 1. Download Git for Windows (or make sure it is installed), and make sure that `git` is in the `PATH` environment variable. To check, open `cmd` and write `git`. If you get a `not recognized` error, then continue with step 1, otherwise skip to step 2. Usually `git.exe` is located in `C:\Program Files\Git\bin` after installation. To add it to `PATH`, right-click on `This PC` -> `Properties` -> `Advanced system settings` -> `Advanced` tab -> `Environment Variables`, and under `System variables` double-click on `PATH`, and add the path to `git` as a listing and click `OK`. -2. Go to the target directory and clone this repository by running the following command in the command prompt: `git clone https://github.com/ZetaGlest/zetaglest-source.git` (or if you have your own fork, replace the first "ZetaGlest" in the URL with your GitHub username). +2. Go to the target directory and clone this repository by running the following command in the command prompt: `git clone https://github.com/Glest/glest-source.git` (or if you have your own fork, replace the first "Glest" in the URL with your GitHub username). 3. Make sure Visual Studio 2015 or 2017 is installed, and that **Windows 8.1 SDK** and Windows Universal CRT SDK are included in the installation. Make sure to have the latest toolset installed for your Visual Studio version. If Visual Studio is installed in a different directory than the default, run the following command before running the script: `SET ProgramFiles(x86)=dir` where `dir` should be replaced with the directory containing the Visual Studio installation, usually `Program Files (x86)`. If Windows is 32-bit, omit the `(x86)` part. 4. Run `setup.bat` in `/mk/windows`. @@ -13,24 +13,24 @@ **Project overview:** -- `glest_game` is the executable game binary +- `game` is the executable game binary -- `libglest` is a shared static library for ZetaGlest's components +- `libglest` is a shared static library for Glest's components - `g3d_viewer` is a `.g3d` model viewer -- `map_editor` is a ZetaGlest map editor and viewer. ZetaGlest maps are stored in the `.gbm` and the `.mgm` formats. +- `map_editor` is a Glest map editor and viewer. Glest maps are stored in the `.mgm` format. - `libstreflop` is a cross-platform float processing library to ensure rounding is the same across machines -- `g2xml` converts `.g3d` ZetaGlest 3D models into a readable XML formatted layout +- `g2xml` converts `.g3d` Glest 3D models into a readable XML formatted layout *Side-note for developers who want to debug:* -To be able to run ZetaGlest from within Visual Studio using the debugger, you need to: +To be able to run Glest from within Visual Studio using the debugger, you need to: -1. Set `glest_game` as the startup project. -2. Right-click `glest_game` -> `Properties` -> `Debugging` and change `Working Directory` to `$(SolutionDir)$(TargetName)\` +1. Set `game` as the startup project. +2. Right-click `game` -> `Properties` -> `Debugging` and change `Working Directory` to `$(SolutionDir)$(TargetName)\` Do this also for `g3d_viewer` and `map_editor`. Configuration in Visual Studio **must be left as `Release`**, and it must match the project architecture as otherwise it won't compile. The settings involved are the following: diff --git a/mk/windows/build-zg+deps-2015-32.bat b/mk/windows/build+deps-2015-32.bat similarity index 75% rename from mk/windows/build-zg+deps-2015-32.bat rename to mk/windows/build+deps-2015-32.bat index 7e6b5c860..7630f0ecc 100644 --- a/mk/windows/build-zg+deps-2015-32.bat +++ b/mk/windows/build+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 "%~1" \ No newline at end of file +call .\build.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+deps-2015-64.bat similarity index 75% rename from mk/windows/build-zg+deps-2015-64.bat rename to mk/windows/build+deps-2015-64.bat index b4d17db5b..45ec72b3a 100644 --- a/mk/windows/build-zg+deps-2015-64.bat +++ b/mk/windows/build+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 "%~1" \ No newline at end of file +call .\build.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+deps-2017-32.bat similarity index 75% rename from mk/windows/build-zg+deps-2017-32.bat rename to mk/windows/build+deps-2017-32.bat index 7c5f3521e..6fc218ae9 100644 --- a/mk/windows/build-zg+deps-2017-32.bat +++ b/mk/windows/build+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 "%~1" \ No newline at end of file +call .\build.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+deps-2017-64.bat similarity index 75% rename from mk/windows/build-zg+deps-2017-64.bat rename to mk/windows/build+deps-2017-64.bat index 1dba83afa..4b8149d6a 100644 --- a/mk/windows/build-zg+deps-2017-64.bat +++ b/mk/windows/build+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 "%~1" \ No newline at end of file +call .\build.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-2015-32.bat similarity index 75% rename from mk/windows/build-zg-2015-32.bat rename to mk/windows/build-2015-32.bat index f5e0d1dcb..9a123a7d8 100644 --- a/mk/windows/build-zg-2015-32.bat +++ b/mk/windows/build-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 "%~1" \ No newline at end of file +call .\build.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-2015-64.bat similarity index 74% rename from mk/windows/build-zg-2015-64.bat rename to mk/windows/build-2015-64.bat index a1a444db7..5a80969e3 100644 --- a/mk/windows/build-zg-2015-64.bat +++ b/mk/windows/build-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 "%~1" \ No newline at end of file +call .\build.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-2017-32.bat similarity index 75% rename from mk/windows/build-zg-2017-32.bat rename to mk/windows/build-2017-32.bat index 3bd389023..1ee6e1fa4 100644 --- a/mk/windows/build-zg-2017-32.bat +++ b/mk/windows/build-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 "%~1" \ No newline at end of file +call .\build.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-2017-64.bat similarity index 74% rename from mk/windows/build-zg-2017-64.bat rename to mk/windows/build-2017-64.bat index 5119595b8..15af6410a 100644 --- a/mk/windows/build-zg-2017-64.bat +++ b/mk/windows/build-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 "%~1" \ No newline at end of file +call .\build.bat 2017-64 nodeps "%~1" \ No newline at end of file diff --git a/mk/windows/build-zg.bat b/mk/windows/build.bat similarity index 94% rename from mk/windows/build-zg.bat rename to mk/windows/build.bat index e66a29393..f3be3e9b2 100644 --- a/mk/windows/build-zg.bat +++ b/mk/windows/build.bat @@ -3,7 +3,7 @@ setlocal EnableDelayedExpansion SET WINDOWS_SDK=8.1 REM 10.0.10586.0 if NOT "%~1"=="" GOTO SETENV -SET /P PLATFORM_SELECT=Compile ZetaGlest for 64-bit Windows ('n' for 32-bit)? ([y]/n): +SET /P PLATFORM_SELECT=Compile Glest for 64-bit Windows ('n' for 32-bit)? ([y]/n): IF /I "%PLATFORM_SELECT%"=="y" GOTO SIXTYFOUR IF /I "%PLATFORM_SELECT%"=="Y" GOTO SIXTYFOUR IF /I "%PLATFORM_SELECT%"=="" GOTO SIXTYFOUR @@ -56,11 +56,11 @@ GOTO CHECKDEPS :CHECKDEPS if "%~2"=="deps" GOTO COMPILEDEPS -if "%~2"=="nodeps" GOTO COMPILEZG +if "%~2"=="nodeps" GOTO COMPILEGAME 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 +IF /I "%BUILD_DEPS%"=="n" GOTO COMPILEGAME +IF /I "%BUILD_DEPS%"=="N" GOTO COMPILEGAME GOTO COMPILEDEPS :COMPILEDEPS @@ -151,13 +151,13 @@ cd ..\..\external\libircclient\%FOLDER_NAME%\ msbuild.exe /p:Configuration=%MSBUILD_CONFIG%;Platform=%PLATFORM%;PlatformToolset=%TOOLSET%;WindowsTargetPlatformVersion=%WINDOWS_SDK% libircclient.sln cd ..\..\..\mk\windows -GOTO COMPILEZG +GOTO COMPILEGAME -:COMPILEZG +:COMPILEGAME ECHO -------------------------------- -Echo Building ZetaGlest... +Echo Building Glest... cd .\%FOLDER_NAME%\ -msbuild.exe /p:Configuration=%MSBUILD_CONFIG%;Platform=%PLATFORM%;PlatformToolset=%TOOLSET% ZetaGlest.sln +msbuild.exe /p:Configuration=%MSBUILD_CONFIG%;Platform=%PLATFORM%;PlatformToolset=%TOOLSET% Glest.sln cd ..\ ECHO. ECHO Copying binaries... @@ -168,7 +168,7 @@ ECHO. ECHO If an error occurred, please follow the instructions in the README.md file in this directory. 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 Thanks for trying out Glest. ECHO. if NOT "%~3"=="nopause" pause \ No newline at end of file diff --git a/mk/windows/clean-zg.bat b/mk/windows/clean.bat similarity index 100% rename from mk/windows/clean-zg.bat rename to mk/windows/clean.bat diff --git a/mk/windows/clone-deps.bat b/mk/windows/clone-deps.bat index f723677de..813440fef 100644 --- a/mk/windows/clone-deps.bat +++ b/mk/windows/clone-deps.bat @@ -6,39 +6,39 @@ IF /I "%AREYOUSURE%" NEQ "y" GOTO END IF /I "%AREYOUSURE%" NEQ "Y" GOTO END Echo. -git clone https://github.com/ZetaGlest/openssl.git dependencies/openssl +git clone https://github.com/Glest/openssl.git dependencies/openssl Echo. -git clone https://github.com/ZetaGlest/curl.git dependencies/src/curl +git clone https://github.com/Glest/curl.git dependencies/src/curl Echo. -git clone https://github.com/ZetaGlest/freetype.git dependencies/src/freetype +git clone https://github.com/Glest/freetype.git dependencies/src/freetype Echo. -git clone https://github.com/ZetaGlest/fribidi.git dependencies/src/fribidi +git clone https://github.com/Glest/fribidi.git dependencies/src/fribidi Echo. -git clone https://github.com/ZetaGlest/ftgl-2.1.3.git dependencies/src/ftgl +git clone https://github.com/Glest/ftgl-2.1.3.git dependencies/src/ftgl Echo. -git clone https://github.com/ZetaGlest/glew.git dependencies/src/glew +git clone https://github.com/Glest/glew.git dependencies/src/glew Echo. -git clone https://github.com/ZetaGlest/freeglut.git dependencies/src/glut +git clone https://github.com/Glest/freeglut.git dependencies/src/glut Echo. -git clone https://github.com/ZetaGlest/libjpeg-turbo.git dependencies/src/jpeg +git clone https://github.com/Glest/libjpeg-turbo.git dependencies/src/jpeg Echo. -git clone https://github.com/ZetaGlest/lua.git dependencies/src/lua +git clone https://github.com/Glest/lua.git dependencies/src/lua Echo. -git clone https://github.com/ZetaGlest/ogg.git dependencies/src/ogg +git clone https://github.com/Glest/ogg.git dependencies/src/ogg Echo. -git clone https://github.com/ZetaGlest/openal-soft.git dependencies/src/openal +git clone https://github.com/Glest/openal-soft.git dependencies/src/openal Echo. -git clone https://github.com/ZetaGlest/libpng.git dependencies/src/png +git clone https://github.com/Glest/libpng.git dependencies/src/png Echo. -git clone https://github.com/ZetaGlest/sdl-mirror.git dependencies/src/sdl2 +git clone https://github.com/Glest/sdl-mirror.git dependencies/src/sdl2 Echo. -git clone https://github.com/ZetaGlest/vorbis.git dependencies/src/vorbis +git clone https://github.com/Glest/vorbis.git dependencies/src/vorbis Echo. -git clone https://github.com/ZetaGlest/wxWidgets-2.9.git dependencies/src/wxwidgets +git clone https://github.com/Glest/wxWidgets-2.9.git dependencies/src/wxwidgets Echo. -git clone https://github.com/ZetaGlest/zlib.git dependencies/src/zlib +git clone https://github.com/Glest/zlib.git dependencies/src/zlib Echo. -git clone https://github.com/ZetaGlest/zetaglest-data.git ..\..\data +git clone https://github.com/Glest/glest-data.git ..\..\data Echo. :END diff --git a/mk/windows/glest.ini b/mk/windows/glest.ini index 3ca58a7d9..258aebf88 100644 --- a/mk/windows/glest.ini +++ b/mk/windows/glest.ini @@ -16,7 +16,7 @@ ConsoleMaxLines=6 ConsoleMaxLinesStored=20 ConsoleTimeout=20 DataPath=..\..\..\..\data -LogPath=$APPDATA\zetaglest\ +LogPath=$APPDATA\glest\ DayTime=1000 DebugLogFile=debug.log DebugMode=false @@ -79,5 +79,5 @@ SoundVolumeMusic=90 StencilBits=0 Textures3D=true UnitParticles=true -UserData_Root=$APPDATA\zetaglest\ +UserData_Root=$APPDATA\glest\ Windowed=false diff --git a/mk/windows/glest.rc b/mk/windows/glest.rc new file mode 100644 index 000000000..28aa61731 --- /dev/null +++ b/mk/windows/glest.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "..\shared\glest.ico" diff --git a/mk/windows/glest_release.ini b/mk/windows/glest_release.ini index e2178241a..8ebed2e25 100644 --- a/mk/windows/glest_release.ini +++ b/mk/windows/glest_release.ini @@ -16,7 +16,7 @@ ConsoleMaxLines=6 ConsoleMaxLinesStored=20 ConsoleTimeout=20 DataPath=data -LogPath=$APPDATA\zetaglest\ +LogPath=$APPDATA\glest\ DayTime=1000 DebugLogFile=debug.log DebugMode=false @@ -59,7 +59,7 @@ FONT_HEIGHT_TEXT=yW InternetGamesBlockScenario=lobby_access Lang=english MaxLights=8 -Masterserver=http://master.megaglest.org/ +Masterserver=http://master.glest.org/ NetPlayerName=newbie NetworkConsistencyChecks=true PhotoMode=false @@ -79,5 +79,5 @@ SoundVolumeMusic=90 StencilBits=0 Textures3D=true UnitParticles=true -UserData_Root=$APPDATA\zetaglest\ +UserData_Root=$APPDATA\glest\ Windowed=false diff --git a/mk/windows/group-binaries.bat b/mk/windows/group-binaries.bat index 15c587691..07ffe972b 100644 --- a/mk/windows/group-binaries.bat +++ b/mk/windows/group-binaries.bat @@ -22,8 +22,8 @@ copy /y vs2017-32\g3d_viewer\g3d_viewer.exe bin\vs2017\g3d_viewer-32.exe copy /y vs2015-32\map_editor\map_editor.exe bin\vs2015\map_editor-32.exe copy /y vs2017-32\map_editor\map_editor.exe bin\vs2017\map_editor-32.exe -copy /y vs2015-32\zetaglest\zetaglest.exe bin\vs2015\zetaglest-32.exe -copy /y vs2017-32\zetaglest\zetaglest.exe bin\vs2017\zetaglest-32.exe +copy /y vs2015-32\glest\glest.exe bin\vs2015\glest-32.exe +copy /y vs2017-32\glest\glest.exe bin\vs2017\glest-32.exe copy /y vs2015-64\g3d_viewer\g3d_viewer.exe bin\vs2015\g3d_viewer-64.exe copy /y vs2017-64\g3d_viewer\g3d_viewer.exe bin\vs2017\g3d_viewer-64.exe @@ -31,5 +31,5 @@ copy /y vs2017-64\g3d_viewer\g3d_viewer.exe bin\vs2017\g3d_viewer-64.exe copy /y vs2015-64\map_editor\map_editor.exe bin\vs2015\map_editor-64.exe copy /y vs2017-64\map_editor\map_editor.exe bin\vs2017\map_editor-64.exe -copy /y vs2015-64\zetaglest\zetaglest.exe bin\vs2015\zetaglest-64.exe -copy /y vs2017-64\zetaglest\zetaglest.exe bin\vs2017\zetaglest-64.exe \ No newline at end of file +copy /y vs2015-64\glest\glest.exe bin\vs2015\glest-64.exe +copy /y vs2017-64\glest\glest.exe bin\vs2017\glest-64.exe \ No newline at end of file diff --git a/mk/windows/prep-for-release-nodeps.bat b/mk/windows/prep-for-release-nodeps.bat index e070c3962..3655ff7e6 100644 --- a/mk/windows/prep-for-release-nodeps.bat +++ b/mk/windows/prep-for-release-nodeps.bat @@ -1,8 +1,8 @@ @echo off -call build-zg-2017-64.bat nopause -call build-zg-2017-32.bat nopause -call build-zg-2015-64.bat nopause -call build-zg-2015-32.bat nopause +call build-2017-64.bat nopause +call build-2017-32.bat nopause +call build-2015-64.bat nopause +call build-2015-32.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 diff --git a/mk/windows/prep-for-release.bat b/mk/windows/prep-for-release.bat index d62913ccb..edd6c9ac1 100644 --- a/mk/windows/prep-for-release.bat +++ b/mk/windows/prep-for-release.bat @@ -1,8 +1,8 @@ @echo off -call build-zg+deps-2017-64.bat nopause -call build-zg+deps-2017-32.bat nopause -call build-zg+deps-2015-64.bat nopause -call build-zg+deps-2015-32.bat nopause +call build+deps-2017-64.bat nopause +call build+deps-2017-32.bat nopause +call build+deps-2015-64.bat nopause +call build+deps-2015-32.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 diff --git a/mk/windows/pull.bat b/mk/windows/pull.bat index 0aa22104d..4b79d719e 100644 --- a/mk/windows/pull.bat +++ b/mk/windows/pull.bat @@ -10,12 +10,12 @@ call .\update-all.bat cd .. echo. -echo Updating zetaglest-code... +echo Updating glest-code... cd ..\.. git pull Echo. -echo Updating zetaglest-data... +echo Updating glest-data... cd data git pull cd ..\ diff --git a/mk/windows/setup.bat b/mk/windows/setup.bat index 645e82b71..c9f6e25cd 100644 --- a/mk/windows/setup.bat +++ b/mk/windows/setup.bat @@ -1,4 +1,4 @@ @echo off call .\clone-deps.bat call .\pull.bat -call .\build-zg.bat \ No newline at end of file +call .\build.bat \ No newline at end of file diff --git a/mk/windows/vs2015-32/ZetaGlest.sln b/mk/windows/vs2015-32/Glest.sln similarity index 91% rename from mk/windows/vs2015-32/ZetaGlest.sln rename to mk/windows/vs2015-32/Glest.sln index f2cdf1680..c5a01806f 100644 --- a/mk/windows/vs2015-32/ZetaGlest.sln +++ b/mk/windows/vs2015-32/Glest.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetaglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest", "glest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}" EndProject diff --git a/mk/windows/vs2015-32/g3d_viewer.vcxproj b/mk/windows/vs2015-32/g3d_viewer.vcxproj index 383027637..43e86be88 100644 --- a/mk/windows/vs2015-32/g3d_viewer.vcxproj +++ b/mk/windows/vs2015-32/g3d_viewer.vcxproj @@ -106,7 +106,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -134,7 +134,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -160,7 +160,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions) true Async @@ -201,7 +201,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -250,13 +250,13 @@ - - + + - + - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-32/zetaglest.vcxproj b/mk/windows/vs2015-32/glest.vcxproj similarity index 74% rename from mk/windows/vs2015-32/zetaglest.vcxproj rename to mk/windows/vs2015-32/glest.vcxproj index 0daeb21d8..cb1f30aed 100644 --- a/mk/windows/vs2015-32/zetaglest.vcxproj +++ b/mk/windows/vs2015-32/glest.vcxproj @@ -12,8 +12,8 @@ {6B0C65F1-D031-46AF-AC0D-7C38892D2952} - zetaglest - zetaglest + glest + glest 8.1 @@ -139,14 +139,14 @@ false false false - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest + glest + glest + glest + glest + glest + glest + glest + glest $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ @@ -178,7 +178,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -203,19 +203,19 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true MachineX86 - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -224,7 +224,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -248,18 +248,18 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -268,7 +268,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -292,18 +292,18 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -315,7 +315,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -333,7 +333,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -367,7 +367,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -385,7 +385,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Console @@ -418,7 +418,7 @@ Speed false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\mingw64\include + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\mingw64\include %(AdditionalUsingDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -470,7 +470,7 @@ Speed false true - ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ + ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ %(AdditionalUsingDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -521,7 +521,7 @@ Neither false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -572,7 +572,7 @@ Neither false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -623,7 +623,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -642,7 +642,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) true Console @@ -674,7 +674,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -693,7 +693,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) true Console @@ -717,42 +717,42 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -769,7 +769,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-32/libzetaglest.vcxproj b/mk/windows/vs2015-32/libglest.vcxproj similarity index 99% rename from mk/windows/vs2015-32/libzetaglest.vcxproj rename to mk/windows/vs2015-32/libglest.vcxproj index eb0cf4978..1a03c36cc 100644 --- a/mk/windows/vs2015-32/libzetaglest.vcxproj +++ b/mk/windows/vs2015-32/libglest.vcxproj @@ -11,9 +11,9 @@ - libzetaglest + libglest {8DAA0C24-95CD-4F66-B4C5-19ABDD771746} - libzetaglest + libglest 8.1 @@ -127,42 +127,42 @@ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ - libzetaglest + libglest - libzetaglest + libglest - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ diff --git a/mk/windows/vs2015-32/map_editor.vcxproj b/mk/windows/vs2015-32/map_editor.vcxproj index 11566fd8e..5cd7b034d 100644 --- a/mk/windows/vs2015-32/map_editor.vcxproj +++ b/mk/windows/vs2015-32/map_editor.vcxproj @@ -103,7 +103,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true EnableFastChecks @@ -131,7 +131,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -157,7 +157,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions) true Async @@ -197,7 +197,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -238,16 +238,16 @@ - - + + - - - + + + @@ -255,7 +255,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-64/ZetaGlest.sln b/mk/windows/vs2015-64/Glest.sln similarity index 92% rename from mk/windows/vs2015-64/ZetaGlest.sln rename to mk/windows/vs2015-64/Glest.sln index 0b1a2ff2b..831a27f04 100644 --- a/mk/windows/vs2015-64/ZetaGlest.sln +++ b/mk/windows/vs2015-64/Glest.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetaglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest", "glest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}" EndProject diff --git a/mk/windows/vs2015-64/g3d_viewer.vcxproj b/mk/windows/vs2015-64/g3d_viewer.vcxproj index d75aea4ea..58e878218 100644 --- a/mk/windows/vs2015-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2015-64/g3d_viewer.vcxproj @@ -110,7 +110,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\glest_game\facilities + ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\game\facilities WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -127,9 +127,9 @@ true - wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)G3D_Viewer.exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows MachineX86 @@ -138,7 +138,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\glest_game\facilities + ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\game\facilities WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -154,9 +154,9 @@ true - wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)G3D_Viewer.exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows @@ -164,7 +164,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\glest_game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -182,9 +182,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;Iphlpapi.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;Iphlpapi.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetFileName) - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Console @@ -201,7 +201,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\glest_game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -219,9 +219,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetFileName) - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Console @@ -238,7 +238,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -281,7 +281,7 @@ %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1618;..\..\..\source\glest_game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1618;..\..\..\source\game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -301,9 +301,9 @@ 4996 - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;version.lib;imm32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;version.lib;imm32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetFileName) - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) true Console @@ -325,10 +325,10 @@ - - + + - + @@ -336,7 +336,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-64/zetaglest.vcxproj b/mk/windows/vs2015-64/glest.vcxproj similarity index 73% rename from mk/windows/vs2015-64/zetaglest.vcxproj rename to mk/windows/vs2015-64/glest.vcxproj index 494e6bf58..94a850e85 100644 --- a/mk/windows/vs2015-64/zetaglest.vcxproj +++ b/mk/windows/vs2015-64/glest.vcxproj @@ -12,8 +12,8 @@ {6B0C65F1-D031-46AF-AC0D-7C38892D2952} - zetaglest - zetaglest + glest + glest 8.1 @@ -111,12 +111,12 @@ false false false - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest + glest + glest + glest + glest + glest + glest $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ @@ -136,7 +136,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -161,19 +161,19 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true MachineX86 - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -182,7 +182,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -206,18 +206,18 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -229,7 +229,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -247,7 +247,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -281,7 +281,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -299,7 +299,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -333,7 +333,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -351,7 +351,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Console @@ -384,7 +384,7 @@ Speed false true - ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ + ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ %(AdditionalUsingDirectories) NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -435,7 +435,7 @@ Neither false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -486,7 +486,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -505,7 +505,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) true Console @@ -529,42 +529,42 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -581,7 +581,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2015-64/libzetaglest.vcxproj b/mk/windows/vs2015-64/libglest.vcxproj similarity index 99% rename from mk/windows/vs2015-64/libzetaglest.vcxproj rename to mk/windows/vs2015-64/libglest.vcxproj index 98fa9c361..99c3e74d2 100644 --- a/mk/windows/vs2015-64/libzetaglest.vcxproj +++ b/mk/windows/vs2015-64/libglest.vcxproj @@ -11,9 +11,9 @@ - libzetaglest + libglest {8DAA0C24-95CD-4F66-B4C5-19ABDD771746} - libzetaglest + libglest 8.1 @@ -103,28 +103,28 @@ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ - libzetaglest + libglest - libzetaglest + libglest - libzetaglest + libglest - libzetaglest + libglest $(SolutionDir)\$(TargetName)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ diff --git a/mk/windows/vs2015-64/map_editor.vcxproj b/mk/windows/vs2015-64/map_editor.vcxproj index 5e1a666b1..440bd8a70 100644 --- a/mk/windows/vs2015-64/map_editor.vcxproj +++ b/mk/windows/vs2015-64/map_editor.vcxproj @@ -107,7 +107,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true EnableFastChecks @@ -124,9 +124,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows MachineX86 @@ -135,7 +135,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -151,9 +151,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows @@ -161,7 +161,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -178,9 +178,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Windows @@ -197,7 +197,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -214,9 +214,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Windows @@ -233,7 +233,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -276,7 +276,7 @@ %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -295,9 +295,9 @@ 4996 - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) true Windows @@ -312,16 +312,16 @@ - - + + - - - + + + @@ -329,7 +329,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-32/ZetaGlest.sln b/mk/windows/vs2017-32/Glest.sln similarity index 91% rename from mk/windows/vs2017-32/ZetaGlest.sln rename to mk/windows/vs2017-32/Glest.sln index d95af4437..1c0aac5d0 100644 --- a/mk/windows/vs2017-32/ZetaGlest.sln +++ b/mk/windows/vs2017-32/Glest.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetaglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest", "glest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}" EndProject diff --git a/mk/windows/vs2017-32/g3d_viewer.vcxproj b/mk/windows/vs2017-32/g3d_viewer.vcxproj index 5161ad291..ed759d9ab 100644 --- a/mk/windows/vs2017-32/g3d_viewer.vcxproj +++ b/mk/windows/vs2017-32/g3d_viewer.vcxproj @@ -106,7 +106,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -134,7 +134,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -160,7 +160,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async @@ -201,7 +201,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -250,10 +250,10 @@ - - + + - + @@ -261,7 +261,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-32/zetaglest.vcxproj b/mk/windows/vs2017-32/glest.vcxproj similarity index 74% rename from mk/windows/vs2017-32/zetaglest.vcxproj rename to mk/windows/vs2017-32/glest.vcxproj index dc1276518..af3842a65 100644 --- a/mk/windows/vs2017-32/zetaglest.vcxproj +++ b/mk/windows/vs2017-32/glest.vcxproj @@ -12,8 +12,8 @@ {6B0C65F1-D031-46AF-AC0D-7C38892D2952} - zetaglest - zetaglest + glest + glest 8.1 @@ -139,14 +139,14 @@ false false false - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest + glest + glest + glest + glest + glest + glest + glest + glest $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ @@ -178,7 +178,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -203,19 +203,19 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true MachineX86 - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -224,7 +224,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -248,18 +248,18 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -268,7 +268,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -292,18 +292,18 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -315,7 +315,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -333,7 +333,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -367,7 +367,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -385,7 +385,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Console @@ -418,7 +418,7 @@ Speed false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -470,7 +470,7 @@ Speed false true - ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies + ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies %(AdditionalUsingDirectories) NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -521,7 +521,7 @@ Neither false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -572,7 +572,7 @@ Neither false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -623,7 +623,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -642,7 +642,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) true Console @@ -674,7 +674,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -693,7 +693,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) true Console @@ -717,42 +717,42 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -769,7 +769,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-32/libzetaglest.vcxproj b/mk/windows/vs2017-32/libglest.vcxproj similarity index 99% rename from mk/windows/vs2017-32/libzetaglest.vcxproj rename to mk/windows/vs2017-32/libglest.vcxproj index f09a5cfb8..0439e4238 100644 --- a/mk/windows/vs2017-32/libzetaglest.vcxproj +++ b/mk/windows/vs2017-32/libglest.vcxproj @@ -11,9 +11,9 @@ - libzetaglest + libglest {8DAA0C24-95CD-4F66-B4C5-19ABDD771746} - libzetaglest + libglest 8.1 @@ -127,42 +127,42 @@ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ - libzetaglest + libglest - libzetaglest + libglest - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ diff --git a/mk/windows/vs2017-32/map_editor.vcxproj b/mk/windows/vs2017-32/map_editor.vcxproj index c190faf84..f83b6bf91 100644 --- a/mk/windows/vs2017-32/map_editor.vcxproj +++ b/mk/windows/vs2017-32/map_editor.vcxproj @@ -103,7 +103,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true EnableFastChecks @@ -131,7 +131,7 @@ Disabled - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -157,7 +157,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async @@ -197,7 +197,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -238,16 +238,16 @@ - - + + - - - + + + @@ -255,7 +255,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-64/ZetaGlest.sln b/mk/windows/vs2017-64/Glest.sln similarity index 89% rename from mk/windows/vs2017-64/ZetaGlest.sln rename to mk/windows/vs2017-64/Glest.sln index 2ee31bb9a..23774fa08 100644 --- a/mk/windows/vs2017-64/ZetaGlest.sln +++ b/mk/windows/vs2017-64/Glest.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzetaglest", "libzetaglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest", "glest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}" EndProject diff --git a/mk/windows/vs2017-64/g3d_viewer.vcxproj b/mk/windows/vs2017-64/g3d_viewer.vcxproj index 1945f773a..c80b2d4c4 100644 --- a/mk/windows/vs2017-64/g3d_viewer.vcxproj +++ b/mk/windows/vs2017-64/g3d_viewer.vcxproj @@ -110,7 +110,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\glest_game\facilities + ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\game\facilities WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -127,9 +127,9 @@ true - wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)G3D_Viewer.exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows MachineX86 @@ -138,7 +138,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\glest_game\facilities + ..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\lib\vc_lib\mswd;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include\msvc;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.8.10\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.x/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.0.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng141;..\..\..\source\game\facilities WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -154,9 +154,9 @@ true - wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase28d.lib;wxbase28d_net.lib;wxbase28d_xml.lib;wxexpatd.lib;wxjpegd.lib;wxmsw28d_adv.lib;wxmsw28d_aui.lib;wxmsw28d_core.lib;wxmsw28d_gl.lib;wxmsw28d_html.lib;wxmsw28d_media.lib;wxmsw28d_qa.lib;wxmsw28d_richtext.lib;wxmsw28d_xrc.lib;wxregexd.lib;wxtiffd.lib;wxzlibd.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_3d.lib;libpng.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)G3D_Viewer.exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows @@ -164,7 +164,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\glest_game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -182,9 +182,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;Iphlpapi.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;Iphlpapi.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetFileName) - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Console @@ -201,7 +201,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\glest_game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1510;..\..\..\source\game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -219,9 +219,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl.lib;sdlmain.lib;dxguid.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng15.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetFileName) - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Console @@ -238,7 +238,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async @@ -281,7 +281,7 @@ %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1618;..\..\..\source\glest_game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../../../source/windows_deps_2015/lpng1618;..\..\..\source\game\facilities;../../../source/windows_deps_2015/glew-1.7.0/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -301,9 +301,9 @@ 4996 - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;version.lib;imm32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxtiff.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxregexu.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;Dbghelp.lib;sdl2.lib;sdl2main.lib;dxguid.lib;libcurl.lib;ws2_32.lib;xerces-c_static_3.lib;libpng16.lib;jpeg.lib;ftgl_static.lib;freetype244MT.lib;glew32s.lib;zlibstat.lib;version.lib;imm32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetFileName) - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) true Console @@ -325,10 +325,10 @@ - - + + - + @@ -336,7 +336,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-64/zetaglest.vcxproj b/mk/windows/vs2017-64/glest.vcxproj similarity index 73% rename from mk/windows/vs2017-64/zetaglest.vcxproj rename to mk/windows/vs2017-64/glest.vcxproj index 96ac01143..2efc04aae 100644 --- a/mk/windows/vs2017-64/zetaglest.vcxproj +++ b/mk/windows/vs2017-64/glest.vcxproj @@ -12,8 +12,8 @@ {6B0C65F1-D031-46AF-AC0D-7C38892D2952} - zetaglest - zetaglest + glest + glest 8.1 @@ -111,12 +111,12 @@ false false false - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest - zetaglest + glest + glest + glest + glest + glest + glest $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ @@ -136,7 +136,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -161,19 +161,19 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true MachineX86 - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -182,7 +182,7 @@ AnySuitable true false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_DEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -206,18 +206,18 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false %(IgnoreSpecificDefaultLibraries) true - $(OutDir)\zetaglest.exe + $(OutDir)\glest.exe true true false false - $(OutDir)\zetaglest.pdb + $(OutDir)\glest.pdb @@ -229,7 +229,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -247,7 +247,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -281,7 +281,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -299,7 +299,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -333,7 +333,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -351,7 +351,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true Console @@ -384,7 +384,7 @@ Speed false true - ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ + ../../../external/libircclient/include;../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\ %(AdditionalUsingDirectories) NDEBUG;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -435,7 +435,7 @@ Neither false true - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -486,7 +486,7 @@ Speed false false - ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows + ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/game/ai;../../../source/game/facilities;../../../source/game/game;../../../source/game/global;../../../source/game/graphics;../../../source/game/gui;../../../source/game/main;../../../source/game/menu;../../../source/game/network;../../../source/game/sound;../../../source/game/steam;../../../source/game/steamshim;../../../source/game/type_instances;../../../source/game/types;../../../source/game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows %(AdditionalUsingDirectories) AL_LIBTYPE_STATIC;WIN32;NDEBUG;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true @@ -505,7 +505,7 @@ dxguid.lib;glew.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;mmc.lib;lua.lib;xerces-c.lib;Dbghelp.lib;libpng.lib;zlibstatic.lib;SDL2-static.lib;sdl2main.lib;winmm.lib;iphlpapi.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype.lib;ftgl_static.lib;version.lib;imm32.lib;jpeg-static.lib;%(AdditionalDependencies) - $(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) true Console @@ -529,42 +529,42 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -581,7 +581,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-64/libzetaglest.vcxproj b/mk/windows/vs2017-64/libglest.vcxproj similarity index 99% rename from mk/windows/vs2017-64/libzetaglest.vcxproj rename to mk/windows/vs2017-64/libglest.vcxproj index 38c9c166b..1c560d1a1 100644 --- a/mk/windows/vs2017-64/libzetaglest.vcxproj +++ b/mk/windows/vs2017-64/libglest.vcxproj @@ -11,9 +11,9 @@ - libzetaglest + libglest {8DAA0C24-95CD-4F66-B4C5-19ABDD771746} - libzetaglest + libglest 8.1 @@ -103,28 +103,28 @@ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ - libzetaglest + libglest - libzetaglest + libglest - libzetaglest + libglest - libzetaglest + libglest $(SolutionDir)\$(TargetName)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ MultiThreaded - libzetaglest + libglest $(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\ $(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\ diff --git a/mk/windows/vs2017-64/map_editor.vcxproj b/mk/windows/vs2017-64/map_editor.vcxproj index 35fdd6a45..2a1b5df0e 100644 --- a/mk/windows/vs2017-64/map_editor.vcxproj +++ b/mk/windows/vs2017-64/map_editor.vcxproj @@ -107,7 +107,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true EnableFastChecks @@ -124,9 +124,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows MachineX86 @@ -135,7 +135,7 @@ Disabled - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -151,9 +151,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows @@ -161,7 +161,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -178,9 +178,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Windows @@ -197,7 +197,7 @@ /arch:SSE2 %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL-1.2.15/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -214,9 +214,9 @@ true - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl.lib;sdlmain.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x86;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x86;%(AdditionalLibraryDirectories) true Windows @@ -233,7 +233,7 @@ %(AdditionalOptions) - ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\glest_game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\glest_game\global;..\..\..\source\glest_game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\glest_game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\glest_game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) + ..\dependencies\src\wxwidgets\include;..\..\..\source\shared_lib\include;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\shared_lib\include\graphics;../dependencies/src/wxwidgets/include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;..\dependencies\src\sdl2\include;../dependencies/src/curl/include;..\..\..\source\game\graphics;..\..\..\source\shared_lib\include\xml;../dependencies/src/xerces/src;..\..\..\source\game\global;..\..\..\source\game\sound;..\..\..\source\shared_lib\include\sound;..\..\..\source\game\game;../../../source/shared_lib/include/map;../dependencies/src/png;..\..\..\source\game\facilities;../dependencies/src/glew/include;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/shared_lib/include/platform/win32;..\dependencies\src\wxwidgets\lib\vc_lib\mswu;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true Async @@ -276,7 +276,7 @@ %(AdditionalOptions) - ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\glest_game\global;..\..\..\source\glest_game\game;..\..\..\source\glest_game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) + ..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\lib\vc_lib\mswu;..\..\..\source\shared_lib\include\util;..\..\..\source\shared_lib\include\platform\win32;..\..\..\source\shared_lib\include\graphics\gl;..\..\..\source\windows_deps_2015\include;..\..\..\source\shared_lib\include\graphics;..\..\..\source\windows_deps_2015\wxWidgets-2.9.3\include;..\..\..\source\shared_lib\include\platform\sdl;../../../source/shared_lib/include/platform/common;../../../source/windows_deps_2015/SDL2-2.0.3/include;../../../source/windows_deps_2015/curl-7.45.0/include;../../../source/shared_lib/include/map;..\..\..\source\game\global;..\..\..\source\game\game;..\..\..\source\game\facilities;..\..\..\source\shared_lib\include\xml;..\..\..\source\shared_lib\include\xml\rapidxml;../../../source/windows_deps_2015/xerces-c-3.1.1/src;%(AdditionalIncludeDirectories) _WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions) true Async @@ -295,9 +295,9 @@ 4996 - wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libzetaglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) + wxbase29u.lib;wxbase29u_net.lib;wxbase29u_xml.lib;wxexpat.lib;wxjpeg.lib;wxmsw29u_adv.lib;wxmsw29u_aui.lib;wxmsw29u_core.lib;wxmsw29u_gl.lib;wxmsw29u_html.lib;wxmsw29u_media.lib;wxmsw29u_qa.lib;wxmsw29u_richtext.lib;wxmsw29u_xrc.lib;wxpng.lib;wxregexu.lib;wxtiff.lib;winmm.lib;rpcrt4.lib;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;comctl32.lib;comdlg32.lib;uuid.lib;advapi32.lib;shell32.lib;libglest.lib;sdl2.lib;sdl2main.lib;dsound.lib;dxguid.lib;Dbghelp.lib;libcurl.lib;ws2_32.lib;ftgl_static.lib;freetype244MT.lib;zlibstat.lib;libeay32.lib;ssleay32.lib;version.lib;imm32.lib;%(AdditionalDependencies) $(OutDir)\$(TargetName).exe - ../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) + ../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);$(DXSDK_DIR)/lib/x64;../../../source/windows_deps_2015/Microsoft DirectX SDK %28November 2007%29/Lib/x64;%(AdditionalLibraryDirectories) true Windows @@ -312,16 +312,16 @@ - - + + - - - + + + @@ -329,7 +329,7 @@ - + {8daa0c24-95cd-4f66-b4c5-19abdd771746} diff --git a/mk/windows/vs2017-64/zetaglest/Start Headless Server.lnk b/mk/windows/vs2017-64/zetaglest/Start Headless Server.lnk deleted file mode 100644 index 77988f213..000000000 Binary files a/mk/windows/vs2017-64/zetaglest/Start Headless Server.lnk and /dev/null differ diff --git a/mk/windows/zetaglest.rc b/mk/windows/zetaglest.rc deleted file mode 100644 index 54189648d..000000000 --- a/mk/windows/zetaglest.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "..\shared\zetaglest.ico" diff --git a/packaging/NOTES b/packaging/NOTES index 829f92c61..704f03066 100644 --- a/packaging/NOTES +++ b/packaging/NOTES @@ -41,13 +41,13 @@ For the slackbuild, the strip command is in the script. When the "Slackbuild" is made, it's not really a build at all. The files in that directory are edited with the correct information, and -then the contents of the "slackbuilds/zetaglest" directory are zipped into a single -"zetaglest.tar.gz" file. At that point, it can be submitted for +then the contents of the "slackbuilds/glest" directory are zipped into a single +"glest.tar.gz" file. At that point, it can be submitted for inclusion to Slackbuilds.org I have 2 other projects there and don't anticipate there will be any problem getting it included. -zetaglest.info - Only shows a few dependencies. Because the other libs +glest.info - Only shows a few dependencies. Because the other libs are shipped with Slackware. They will be found when the user processes the slackbuild script diff --git a/packaging/Slackbuild/zetaglest/README b/packaging/Slackbuild/glest/README similarity index 77% rename from packaging/Slackbuild/zetaglest/README rename to packaging/Slackbuild/glest/README index d0c5435c5..c6fe7b2d6 100644 --- a/packaging/Slackbuild/zetaglest/README +++ b/packaging/Slackbuild/glest/README @@ -1,5 +1,5 @@ -ZetaGlest is a network multi-player real-time strategy game engine. -It's shipped with the ZetaPack mod, which includes several factions, +Glest is a network multi-player real-time strategy game engine. +It's shipped with the FactionPack mod, which includes several factions, each one consisting of many 3d characters. The factions are loosely based on historical empires with added elements of fantasy, such as mummies produced by Egyptian priests, Indian shamans who summon diff --git a/packaging/Slackbuild/glest/README.Slackware b/packaging/Slackbuild/glest/README.Slackware new file mode 100644 index 000000000..57e012044 --- /dev/null +++ b/packaging/Slackbuild/glest/README.Slackware @@ -0,0 +1,103 @@ +[![Build Status](https://travis-ci.org/Glest/glest-source.svg?branch=develop)](https://travis-ci.org/Glest/glest-source) +[![Coverity Scan Build Status](https://scan.coverity.com/projects/16606/badge.svg)](https://scan.coverity.com/projects/glest) + +**This is the game engine source code repository.** + +[Glest](https://glest.github.io/docs/) is a fork of [Glest](http://glest.org/), +a libre software cross platform real-time strategy game. + +Glest is a network multi-player real-time strategy game engine. +It's shipped with the FactionPack mod, which includes several factions, +each one consisting of many 3d characters. The factions are loosely +based on historical empires with added elements of fantasy, such as +mummies produced by Egyptian priests, Indian shamans who summon +thunderbirds for air assaults, and Norsemen who can build flying +valkries and "Thors". Start the game by harvesting natural resources, +then use the cash to produce an army. Single-player mode against the +CPU is also available. + +**README Contents** + +* [Stay Informed (Updates)](https://github.com/Glest/glest-source#stay-informed-updates) +* [Project Goals](https://github.com/Glest/glest-source#why-this-fork-project-goals) +* [FAQ](https://github.com/Glest/glest-source#faq) +* [Download executable files](https://github.com/Glest/glest-source#download-executable-files) +* [Running](https://github.com/Glest/glest-source#running) +* [Extra Tech trees, mods, tilesets, scenarious (not yet available on the Glest server)](https://github.com/Glest/glest-source#extra-tech-trees-mods-tilesets-scenarious-not-yet-available-on-the-glest-server) +* [Contributing and Testing](https://github.com/Glest/glest-source#contributing-and-testing) +* [Contact](https://github.com/Glest/glest-source#contact) + +**[System Requirements](https://glest.github.io/docs/system_requirements.html)** + +**[Screenshots](https://github.com/Glest/screenshots)** + +Open games and [Server list and player stats](https://glest.dreamhosters.com/) + +[Detailed information about units in the game](https://glest.github.io/) + +## Stay Informed (Updates) + +* [ChangeLog.md](https://github.com/Glest/glest-source/blob/develop/ChangeLog.md)
+* [![RSS](rss_23x23.jpeg)](https://glest.github.io/feed.xml) +[The Glest Blog](https://glest.github.io/blog/)
+* [![RSS](rss_23x23.jpeg)](https://github.com/Glest/glest-source/commits/develop.atom) +[Recent Commits to glest-source:develop](https://github.com/Glest/glest-source/commits/develop.atom)
+* [![RSS](rss_23x23.jpeg)](https://github.com/Glest/glest-data/commits/develop.atom) +[Recent Commits to glest-data:develop](https://github.com/Glest/glest-data/commits/develop.atom)
+* [![RSS](rss_23x23.jpeg)](https://github.com/Glest/glest.github.io/commits/master.atom) +[Recent Commits to the web site](https://github.com/Glest/glest.github.io/commits/master.atom) + +## Why this fork? (Project Goals) + +Because we love Glest! We wanted to take the project into a +slightly different direction, and therefore we forked Glest into +the Glest project. + +## FAQ + +The FAQ is located at +[https://glest.github.io/docs/faq.html](https://glest.github.io/docs/faq.html). + +## Download executable files + +On Windows, the easiest way to get started is to [download and run the +installer](https://github.com/Glest/windows-installer). If you want +to contribute with the code on Windows, [please follow these +instructions](https://github.com/Glest/glest-source/blob/develop/mk/windows/README.md). + +For other operating systems, you must [**build and install from +source**](https://github.com/Glest/glest-source/blob/develop/BUILD.md) +(Later, we'll be providing binary packages). + +(The ETA for the first official release can be viewed from the [development +milestone](https://github.com/Glest/glest-source/milestone/1).) + +## Running + + ./glest (if you didn't install) + +OR + + glest (if you installed and the binary is in your PATH) + +To run your own headless (dedicated) server, see [the FAQ](https://glest.github.io/docs/faq.html#headlessserver). + +### Extra Tech trees, mods, tilesets, scenarious (not yet available on the Glest server) + +* [MODS.md](https://github.com/Glest/glest-data/blob/develop/MODS.md) +* [TILESETS.md](https://github.com/Glest/glest-data/blob/develop/TILESETS.md) +* [SCENARIOS.md](https://github.com/Glest/glest-data/blob/develop/SCENARIOS.md) + +### Contributing and Testing + +If you'll be contributing code or changes to data, the procedures for +forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) + +Please see [CONTRIBUTING.md](https://github.com/Glest/glest-source/blob/develop/CONTRIBUTING.md) +for extended, important instructions and guidelines for contributing. + +## Contact + +* [Discord](https://discord.gg/WaAaXS7) +* [Message Board](https://groups.google.com/forum/#!forum/glest) +* Email: glest@gmail.com diff --git a/packaging/Slackbuild/zetaglest/doinst.sh b/packaging/Slackbuild/glest/doinst.sh similarity index 100% rename from packaging/Slackbuild/zetaglest/doinst.sh rename to packaging/Slackbuild/glest/doinst.sh diff --git a/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild b/packaging/Slackbuild/glest/glest.SlackBuild old mode 100755 new mode 100644 similarity index 96% rename from packaging/Slackbuild/zetaglest/zetaglest.SlackBuild rename to packaging/Slackbuild/glest/glest.SlackBuild index 0aa2e26c6..3702bc7ff --- a/packaging/Slackbuild/zetaglest/zetaglest.SlackBuild +++ b/packaging/Slackbuild/glest/glest.SlackBuild @@ -5,8 +5,8 @@ # Copyright 2011-2017 Larry Hajali # All rights reserved. # -# Modified for ZetaGlest -# Copyright 2018 The ZetaGlest Team +# Modified for Glest +# Copyright 2018 The Glest Team # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -25,7 +25,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=zetaglest +PRGNAM=glest VERSION=${VERSION:-0.8.02} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/packaging/Slackbuild/zetaglest/zetaglest.info b/packaging/Slackbuild/glest/glest.info similarity index 81% rename from packaging/Slackbuild/zetaglest/zetaglest.info rename to packaging/Slackbuild/glest/glest.info index 0e52c924d..235160a74 100644 --- a/packaging/Slackbuild/zetaglest/zetaglest.info +++ b/packaging/Slackbuild/glest/glest.info @@ -1,6 +1,6 @@ -PRGNAM="zetaglest" +PRGNAM="glest" VERSION="0.8.02" -HOMEPAGE="https://zetaglest.github.io/" +HOMEPAGE="https://glest.github.io/" DOWNLOAD="source-placeholder \ data-placeholder" MD5SUM="source \ diff --git a/packaging/Slackbuild/glest/slack-desc b/packaging/Slackbuild/glest/slack-desc new file mode 100644 index 000000000..ee06fa5ae --- /dev/null +++ b/packaging/Slackbuild/glest/slack-desc @@ -0,0 +1,21 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +glest: glest (network multi-player real-time strategy game engine) +glest: +glest: Glest is a network multi-player real-time strategy game engine. +glest: It's shipped with the FactionPack mod, which includes several factions, +glest: each one consisting of many 3d characters. The factions are loosely +glest: based on historical empires with added elements of fantasy, such as +glest: mummies produced by Egyptian priests, Indian shamans who summon +glest: thunderbirds for air assaults, and Norsemen who can build flying +glest: valkries and "Thors". Start the game by harvesting natural resources, +glest: then use the cash to produce an army. +glest: Homepage: https://glest.github.io/ + + diff --git a/packaging/Slackbuild/zetaglest/README.Slackware b/packaging/Slackbuild/zetaglest/README.Slackware deleted file mode 100644 index b32d926ea..000000000 --- a/packaging/Slackbuild/zetaglest/README.Slackware +++ /dev/null @@ -1,103 +0,0 @@ -[![Build Status](https://travis-ci.org/ZetaGlest/zetaglest-source.svg?branch=develop)](https://travis-ci.org/ZetaGlest/zetaglest-source) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/16606/badge.svg)](https://scan.coverity.com/projects/zetaglest) - -**This is the game engine source code repository.** - -[ZetaGlest](https://zetaglest.github.io/docs/) is a fork of [MegaGlest](http://megaglest.org/), -a libre software cross platform real-time strategy game. - -ZetaGlest is a network multi-player real-time strategy game engine. -It's shipped with the ZetaPack mod, which includes several factions, -each one consisting of many 3d characters. The factions are loosely -based on historical empires with added elements of fantasy, such as -mummies produced by Egyptian priests, Indian shamans who summon -thunderbirds for air assaults, and Norsemen who can build flying -valkries and "Thors". Start the game by harvesting natural resources, -then use the cash to produce an army. Single-player mode against the -CPU is also available. - -**README Contents** - -* [Stay Informed (Updates)](https://github.com/ZetaGlest/zetaglest-source#stay-informed-updates) -* [Project Goals](https://github.com/ZetaGlest/zetaglest-source#why-this-fork-project-goals) -* [FAQ](https://github.com/ZetaGlest/zetaglest-source#faq) -* [Download executable files](https://github.com/ZetaGlest/zetaglest-source#download-executable-files) -* [Running](https://github.com/ZetaGlest/zetaglest-source#running) -* [Extra Tech trees, mods, tilesets, scenarious (not yet available on the ZetaGlest server)](https://github.com/ZetaGlest/zetaglest-source#extra-tech-trees-mods-tilesets-scenarious-not-yet-available-on-the-zetaglest-server) -* [Contributing and Testing](https://github.com/ZetaGlest/zetaglest-source#contributing-and-testing) -* [Contact](https://github.com/ZetaGlest/zetaglest-source#contact) - -**[System Requirements](https://zetaglest.github.io/docs/system_requirements.html)** - -**[Screenshots](https://github.com/ZetaGlest/screenshots)** - -Open games and [Server list and player stats](https://zetaglest.dreamhosters.com/) - -[Detailed information about units in the game](https://zetaglest.github.io/) - -## Stay Informed (Updates) - -* [ChangeLog.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/ChangeLog.md)
-* [![RSS](rss_23x23.jpeg)](https://zetaglest.github.io/feed.xml) -[The ZetaGlest Blog](https://zetaglest.github.io/blog/)
-* [![RSS](rss_23x23.jpeg)](https://github.com/ZetaGlest/zetaglest-source/commits/develop.atom) -[Recent Commits to zetaglest-source:develop](https://github.com/ZetaGlest/zetaglest-source/commits/develop.atom)
-* [![RSS](rss_23x23.jpeg)](https://github.com/ZetaGlest/zetaglest-data/commits/develop.atom) -[Recent Commits to zetaglest-data:develop](https://github.com/ZetaGlest/zetaglest-data/commits/develop.atom)
-* [![RSS](rss_23x23.jpeg)](https://github.com/ZetaGlest/zetaglest.github.io/commits/master.atom) -[Recent Commits to the web site](https://github.com/ZetaGlest/zetaglest.github.io/commits/master.atom) - -## Why this fork? (Project Goals) - -Because we love MegaGlest! We wanted to take the project into a -slightly different direction, and therefore we forked MegaGlest into -the ZetaGlest project. - -## FAQ - -The FAQ is located at -[https://zetaglest.github.io/docs/faq.html](https://zetaglest.github.io/docs/faq.html). - -## Download executable files - -On Windows, the easiest way to get started is to [download and run the -installer](https://github.com/ZetaGlest/windows-installer). If you want -to contribute with the code on Windows, [please follow these -instructions](https://github.com/ZetaGlest/zetaglest-source/blob/develop/mk/windows/README.md). - -For other operating systems, you must [**build and install from -source**](https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md) -(Later, we'll be providing binary packages). - -(The ETA for the first official release can be viewed from the [development -milestone](https://github.com/ZetaGlest/zetaglest-source/milestone/1).) - -## Running - - ./zetaglest (if you didn't install) - -OR - - zetaglest (if you installed and the binary is in your PATH) - -To run your own headless (dedicated) server, see [the FAQ](https://zetaglest.github.io/docs/faq.html#headlessserver). - -### Extra Tech trees, mods, tilesets, scenarious (not yet available on the ZetaGlest server) - -* [MODS.md](https://github.com/ZetaGlest/zetaglest-data/blob/develop/MODS.md) -* [TILESETS.md](https://github.com/ZetaGlest/zetaglest-data/blob/develop/TILESETS.md) -* [SCENARIOS.md](https://github.com/ZetaGlest/zetaglest-data/blob/develop/SCENARIOS.md) - -### Contributing and Testing - -If you'll be contributing code or changes to data, the procedures for -forking and cloning are outlined in [CONTRIBUTING.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/CONTRIBUTING.md) - -Please see [CONTRIBUTING.md](https://github.com/ZetaGlest/zetaglest-source/blob/develop/CONTRIBUTING.md) -for extended, important instructions and guidelines for contributing. - -## Contact - -* [Discord](https://discord.gg/WaAaXS7) -* [Message Board](https://groups.google.com/forum/#!forum/zetaglest) -* Email: zetaglest@gmail.com diff --git a/packaging/Slackbuild/zetaglest/slack-desc b/packaging/Slackbuild/zetaglest/slack-desc deleted file mode 100644 index 7464ba309..000000000 --- a/packaging/Slackbuild/zetaglest/slack-desc +++ /dev/null @@ -1,21 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -zetaglest: zetaglest (network multi-player real-time strategy game engine) -zetaglest: -zetaglest: ZetaGlest is a network multi-player real-time strategy game engine. -zetaglest: It's shipped with the ZetaPack mod, which includes several factions, -zetaglest: each one consisting of many 3d characters. The factions are loosely -zetaglest: based on historical empires with added elements of fantasy, such as -zetaglest: mummies produced by Egyptian priests, Indian shamans who summon -zetaglest: thunderbirds for air assaults, and Norsemen who can build flying -zetaglest: valkries and "Thors". Start the game by harvesting natural resources, -zetaglest: then use the cash to produce an army. -zetaglest: Homepage: https://zetaglest.github.io/ - - diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 9cda436e1..6a8165cfa 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,5 +1,5 @@ -Zetaglest 1.0 +Glest 1.0 - * First release of Zetaglest after being forked from Megaglest + * First release of Glest after being forked from Glest -- Andy Alt 15.09.2018 2018/09/15 12:44:46 diff --git a/packaging/debian/clean b/packaging/debian/clean index 86f347234..a33a28060 100644 --- a/packaging/debian/clean +++ b/packaging/debian/clean @@ -1,5 +1,5 @@ -build/zetaglest_editor -build/zetaglest -build/zetaglest_g3dviewer +build/glest_editor +build/glest +build/glest_g3dviewer build/glexemel/g2xml build/glexemel/xml2g diff --git a/packaging/debian/control b/packaging/debian/control index b6fc07a39..48b5b2f60 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -1,7 +1,7 @@ -Source: zetaglest +Source: glest Section: games Priority: extra -Maintainer: ZetaGlest Team +Maintainer: Glest Team Uploaders: Andy Alt Build-Depends: @@ -26,22 +26,22 @@ Build-Depends: libz-dev, xauth Standards-Version: 3.9.8 -Homepage: https://github.com/ZetaGlest +Homepage: https://github.com/Glest -Package: zetaglest +Package: glest Architecture: any Depends: famfamfam-flag-png, fonts-liberation, fonts-uralic, - zetaglest-data (>= 0.8.02), + glest-data (>= 0.8.02), p7zip-full, fonts-dejavu-core, fonts-wqy-zenhei, ${misc:Depends}, ${shlibs:Depends} Description: network multi-player real-time strategy game engine. - It's shipped with the ZetaPack mod, which includes several factions, + It's shipped with the FactionPack mod, which includes several factions, each one consisting of many 3d characters. The factions are loosely based on historical empires with added elements of fantasy, such as mummies produced by Egyptian priests, Indian shamans who summon diff --git a/packaging/debian/copyright b/packaging/debian/copyright index d240504a0..faf6d619d 100644 --- a/packaging/debian/copyright +++ b/packaging/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ZetaGlest +Upstream-Name: Glest Upstream-Contact: Andy Alt -Source: https://github.com/ZetaGlest/zetaglest-source +Source: https://github.com/Glest/glest-source Files: * Copyright: 2008-2011 Titus Tscharntke (info@titusgames.de) @@ -14,8 +14,8 @@ Copyright: 2008-2011 Titus Tscharntke (info@titusgames.de) 2005 Roland BROCHAR --> string utilities 2006-2008 Alexander Chemeris --> data types for win32 2005-2010 Andreas Martin (andreas.martin@linuxmail.org) - 2001-2016 The MegaGlest Team and other contributors - 2018 The ZetaGlest Team and other contributors + 2001-2016 The Glest Team and other contributors + 2018 The Glest Team and other contributors License: GPL-3+ Comment: See also AUTHORS.md for a list of contributors and @@ -25,7 +25,7 @@ Files: debian/* Copyright: 2011-2014, Mark Vejvoda 2012-2013, Paul Wise 2014-2016, Markus Koschany - 2018 The ZetaGlest Team + 2018 The Glest Team License: GPL-3+ Files: mk/cmake/Modules/FindGLIB2.cmake diff --git a/packaging/debian/zetaglest.README.Debian b/packaging/debian/glest.README.Debian similarity index 50% rename from packaging/debian/zetaglest.README.Debian rename to packaging/debian/glest.README.Debian index 4a2a7ea61..145818004 100644 --- a/packaging/debian/zetaglest.README.Debian +++ b/packaging/debian/glest.README.Debian @@ -2,5 +2,5 @@ ZegaGlest for Debian ----------------------- If your glx version is lower than 1.3 set CheckGlCaps=0 in the -~/.zetaglest/glestuser.ini file or pass the --disable-opengl-checks -command line parameter to zetaglest. +~/.glest/glestuser.ini file or pass the --disable-opengl-checks +command line parameter to glest. diff --git a/packaging/debian/zetaglest.lintian-overrides b/packaging/debian/glest.lintian-overrides similarity index 85% rename from packaging/debian/zetaglest.lintian-overrides rename to packaging/debian/glest.lintian-overrides index 92a0a0bed..d9d82e78b 100644 --- a/packaging/debian/zetaglest.lintian-overrides +++ b/packaging/debian/glest.lintian-overrides @@ -2,7 +2,7 @@ # Splitting the path into two lines would make the example even more # unreadable. manpage-has-errors-from-man -# The icon is provided by zetaglest-data now +# The icon is provided by glest-data now menu-icon-missing # This script does not need to be executable. script-not-executable diff --git a/packaging/debian/glest.menu b/packaging/debian/glest.menu new file mode 100644 index 000000000..bbe64d0cd --- /dev/null +++ b/packaging/debian/glest.menu @@ -0,0 +1,7 @@ +?package(glest): \ + needs="X11" \ + section="Games/Strategy" \ + title="Glest" \ + longtitle="A 3D real time strategy game." \ + command="/usr/games/glest" \ + icon="/usr/share/pixmaps/glest.xpm" diff --git a/packaging/debian/rules b/packaging/debian/rules index 73723d97a..b222ae094 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -19,10 +19,10 @@ override_dh_installchangelogs: override_dh_install: dh_install # Remove empty directory - $(RM) -r debian/zetaglest/usr/share/games/zetaglest/data + $(RM) -r debian/glest/usr/share/games/glest/data echo \ "CountryTexturePath=/usr/share/flags/countries/16x11/" >> \ - debian/zetaglest/usr/share/games/zetaglest/glest.ini + debian/glest/usr/share/games/glest/glest.ini get-orig-source: uscan --verbose --download-current-version --force-download diff --git a/packaging/debian/watch b/packaging/debian/watch index d2b681a17..ca66c0d66 100644 --- a/packaging/debian/watch +++ b/packaging/debian/watch @@ -1,2 +1,2 @@ version=0.8 -https://github.com/ZetaGlest/zetaglest-source/releases .*/zetaglest-source-([\d.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +https://github.com/Glest/glest-source/releases .*/glest-source-([\d.]+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff --git a/packaging/debian/zetaglest.menu b/packaging/debian/zetaglest.menu deleted file mode 100644 index 0f765ab95..000000000 --- a/packaging/debian/zetaglest.menu +++ /dev/null @@ -1,7 +0,0 @@ -?package(zetaglest): \ - needs="X11" \ - section="Games/Strategy" \ - title="ZetaGlest" \ - longtitle="A 3D real time strategy game." \ - command="/usr/games/zetaglest" \ - icon="/usr/share/pixmaps/zetaglest.xpm" diff --git a/source/.gitignore b/source/.gitignore index 408dc5b76..39ba8defd 100644 --- a/source/.gitignore +++ b/source/.gitignore @@ -1,4 +1,4 @@ /windows_deps*/ -/glest_game/facilities/gitversion.h -/glest_game/site/ +/game/facilities/gitversion.h +/game/site/ /Debug diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index dcedc7277..f191812c1 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -1,7 +1,7 @@ # common libraries OPTION(BUILD_MODEL_VIEWER "Build model viewer" ON) -SET(TARGET_NAME "zetaglest_g3dviewer") +SET(TARGET_NAME "glest_g3dviewer") MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MODEL_VIEWER}") IF(BUILD_MODEL_VIEWER) @@ -89,13 +89,13 @@ IF(BUILD_MODEL_VIEWER) ENDIF() ######################################################################################### - # zetaglest G3D Model Viewer + # glest G3D Model Viewer SET(DIRS_WITH_SRC . ) - SET(GLEST_MAIN_INCLUDE_ROOT "../glest_game/") + SET(GLEST_MAIN_INCLUDE_ROOT "../game/") SET(GLEST_LIB_INCLUDE_ROOT "../shared_lib/include/") SET(GLEST_LIB_INCLUDE_DIRS @@ -128,35 +128,35 @@ IF(BUILD_MODEL_VIEWER) ENDIF() INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/${SDL_VERSION_SNAME} ) - SET(ZG_SOURCE_FILES "../glest_game/graphics/particle_type.cpp" "../glest_game/graphics/unit_particle_type.cpp" "../glest_game/global/config.cpp") + SET(GLEST_SOURCE_FILES "../game/graphics/particle_type.cpp" "../game/graphics/unit_particle_type.cpp" "../game/global/config.cpp") FOREACH(DIR IN LISTS DIRS_WITH_SRC) INCLUDE_DIRECTORIES( ${DIR} ) set(SRC_DIR_TO_GLOB ${DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB INCLUDE_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.h) - SET(ZG_INCLUDE_FILES ${ZG_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR}) + SET(GLEST_INCLUDE_FILES ${GLEST_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR}) IF(APPLE) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.m) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) ENDIF(APPLE) ENDFOREACH(DIR) - SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) + SET_SOURCE_FILES_PROPERTIES(${GLEST_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) - ADD_EXECUTABLE(${TARGET_NAME} ${ZG_SOURCE_FILES} ${ZG_INCLUDE_FILES}) + ADD_EXECUTABLE(${TARGET_NAME} ${GLEST_SOURCE_FILES} ${GLEST_INCLUDE_FILES}) IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND) TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) ENDIF() - TARGET_LINK_LIBRARIES(${TARGET_NAME} libzetaglest) + TARGET_LINK_LIBRARIES(${TARGET_NAME} libglest) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) # Installation of the program diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp index 0f1f9daaa..8ab82fa25 100644 --- a/source/g3d_viewer/main.cpp +++ b/source/g3d_viewer/main.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -191,13 +191,13 @@ namespace Shared { printf("\n\n \tWhere x is a g3d filename to load separated with a"); printf("\n\n \tcomma and one or more skill names to try loading."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/zetapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_UNIT])); + printf("\n\n \t%s %s=techs/factionpack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_UNIT])); printf("\n\n \ttech/units/battle_machine,attack_skill,stop_skill"); printf("\n\n%s=x \tAuto load the model specified in path/filename x.", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); printf("\n\n \tWhere x is a g3d filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/zetapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); + printf("\n\n \t%s %s=techs/factionpack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); printf("\n\n \ttech/units/battle_machine/models/battle_machine_dying.g3d"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL_ANIMATION_VALUE])); @@ -217,14 +217,14 @@ namespace Shared { printf("\n\n \texample:"); printf("\n\n \t%s %s=transparent,", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_AUTO_SCREENSHOT])); printf("\n\n \tdisable_grid,saveas-test.png,resize-800x600"); - printf("\n\n \t%s=techs/zetapack/factions/tech/units/", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); + printf("\n\n \t%s=techs/factionpack/factions/tech/units/", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_MODEL])); printf("\n\n \tbattle_machine/models/battle_machine_dying.g3d"); // "================================================================================" printf("\n\n%s=x \tAuto load the particle specified in path/filename x.", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE])); printf("\n\n \tWhere x is a Particle XML filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/zetapack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE])); + printf("\n\n \t%s %s=techs/factionpack/factions/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE])); printf("\n\n \tpersian/units/genie/glow_particles.xml"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_PROJECTILE])); @@ -233,7 +233,7 @@ namespace Shared { printf("\n\n \tWhere x is a Projectile Particle Definition XML"); printf("\n\n \t filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/zetapack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_PROJECTILE])); + printf("\n\n \t%s %s=techs/factionpack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_PROJECTILE])); printf("\n\n \tfactions/persian/units/genie/particle_proj.xml"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_SPLASH])); @@ -242,7 +242,7 @@ namespace Shared { printf("\n\n \tWhere x is a Splash Particle Definition XML"); printf("\n\n \t filename to load."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/zetapack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_SPLASH])); + printf("\n\n \t%s %s=techs/factionpack/", extractFileFromDirectoryPath(argv0).c_str(), (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_SPLASH])); printf("\n\n \tfactions/persian/units/genie/particle_splash.xml"); printf("\n\n%s=x ", (const char *) wxConvCurrent->cWX2MB(GAME_ARGS[GAME_ARG_LOAD_PARTICLE_LOOP_VALUE])); @@ -285,7 +285,7 @@ namespace Shared { // class MainWindow // =============================================== - const string MainWindow::winHeader = string("ZetaGlest G3D viewer ") + G3DViewerVersionString; + const string MainWindow::winHeader = string("Glest G3D viewer ") + G3DViewerVersionString; const float defaultspeed = 0.025f; @@ -465,7 +465,7 @@ namespace Shared { //@="blergcorp.blergapp.v1" //Open the registry key. - wstring subKey = L"Software\\Classes\\zetaglest.g3d\\shell\\open\\command"; + wstring subKey = L"Software\\Classes\\glest.g3d\\shell\\open\\command"; HKEY keyHandle; DWORD dwDisposition; RegCreateKeyEx(HKEY_CURRENT_USER, subKey.c_str(), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &keyHandle, &dwDisposition); @@ -480,7 +480,7 @@ namespace Shared { subKey = L"Software\\Classes\\.g3d"; RegCreateKeyEx(HKEY_CURRENT_USER, subKey.c_str(), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &keyHandle, &dwDisposition); //Set the value. - launchApp = L"zetaglest.g3d"; + launchApp = L"glest.g3d"; len = (launchApp.size() + 1) * sizeof(wchar_t); RegSetValueEx(keyHandle, NULL, 0, REG_SZ, (PBYTE) launchApp.c_str(), len); RegCloseKey(keyHandle); @@ -898,9 +898,9 @@ namespace Shared { fileDialog->SetWildcard(wxT("XML files (*.xml)|*.xml")); if (isControlKeyPressed == true) { - fileDialog->SetMessage(wxT("Adding ZetaGlest particle to current view.")); + fileDialog->SetMessage(wxT("Adding Glest particle to current view.")); } else { - fileDialog->SetMessage(wxT("Selecting ZetaGlest particle for current view.")); + fileDialog->SetMessage(wxT("Selecting Glest particle for current view.")); } if (fileDialog->ShowModal() == wxID_OK) { @@ -930,9 +930,9 @@ namespace Shared { fileDialog->SetWildcard(wxT("XML files (*.xml)|*.xml")); if (isControlKeyPressed == true) { - fileDialog->SetMessage(wxT("Adding ZetaGlest projectile particle to current view.")); + fileDialog->SetMessage(wxT("Adding Glest projectile particle to current view.")); } else { - fileDialog->SetMessage(wxT("Selecting ZetaGlest projectile particle for current view.")); + fileDialog->SetMessage(wxT("Selecting Glest projectile particle for current view.")); } if (fileDialog->ShowModal() == wxID_OK) { @@ -962,9 +962,9 @@ namespace Shared { fileDialog->SetWildcard(wxT("XML files (*.xml)|*.xml")); if (isControlKeyPressed == true) { - fileDialog->SetMessage(wxT("Adding ZetaGlest splash particle to current view.")); + fileDialog->SetMessage(wxT("Adding Glest splash particle to current view.")); } else { - fileDialog->SetMessage(wxT("Selecting ZetaGlest splash particle for current view.")); + fileDialog->SetMessage(wxT("Selecting Glest splash particle for current view.")); } if (fileDialog->ShowModal() == wxID_OK) { @@ -1263,7 +1263,7 @@ namespace Shared { } } catch (std::runtime_error &e) { std::cout << e.what() << std::endl; - wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a ZetaGlest particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal(); + wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a Glest particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal(); } } @@ -1514,7 +1514,7 @@ namespace Shared { } } catch (std::runtime_error &e) { std::cout << e.what() << std::endl; - wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a ZetaGlest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal(); + wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a Glest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal(); } if (timer) timer->Start(100); if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] after load [%s]\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str()); @@ -1619,7 +1619,7 @@ namespace Shared { } } catch (std::runtime_error &e) { std::cout << e.what() << std::endl; - wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a ZetaGlest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal(); + wxMessageDialog(NULL, ToUnicode(e.what()), ToUnicode("Not a Glest projectile particle XML file, or broken"), wxOK | wxICON_ERROR).ShowModal(); } if (timer) timer->Start(100); if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] after load [%s] particleSplashPathList.size() = " SIZE_T_SPECIFIER "\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, path.c_str(), this->particleSplashPathList.size()); diff --git a/source/g3d_viewer/main.h b/source/g3d_viewer/main.h index 7a1016759..ed3c9e44c 100644 --- a/source/g3d_viewer/main.h +++ b/source/g3d_viewer/main.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/g3d_viewer/renderer.cpp b/source/g3d_viewer/renderer.cpp index 85b567325..8c8f67953 100644 --- a/source/g3d_viewer/renderer.cpp +++ b/source/g3d_viewer/renderer.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -108,7 +108,7 @@ namespace Shared { message += "Your system supports OpenGL version \""; message += getGlVersion() + string("\"\n"); - message += "ZetaGlest needs a version that supports\n"; + message += "Glest needs a version that supports\n"; message += "glActiveTexture (OpenGL 1.3) or the ARB_multitexture extension."; throw game_runtime_error(message.c_str()); @@ -121,7 +121,7 @@ namespace Shared { message += "Your system supports OpenGL version \""; message += getGlVersion() + string("\"\n"); - message += "ZetaGlest needs at least version 1.3 to work\n"; + message += "Glest needs at least version 1.3 to work\n"; message += "You may solve this problem by installing your latest video card drivers"; throw game_runtime_error(message.c_str()); @@ -130,7 +130,7 @@ namespace Shared { //opengl 1.4 or extension //if(isGlVersionSupported(1, 4, 0) == false) { if (glewIsSupported("GL_VERSION_1_4") == false) { - checkExtension("GL_ARB_texture_env_crossbar", "ZetaGlest"); + checkExtension("GL_ARB_texture_env_crossbar", "Glest"); } } diff --git a/source/g3d_viewer/renderer.h b/source/g3d_viewer/renderer.h index 824f62ade..8f682a42a 100644 --- a/source/g3d_viewer/renderer.h +++ b/source/g3d_viewer/renderer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/CMakeLists.txt b/source/game/CMakeLists.txt similarity index 87% rename from source/glest_game/CMakeLists.txt rename to source/game/CMakeLists.txt index 37819a981..6ee634a78 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/game/CMakeLists.txt @@ -2,10 +2,10 @@ # common libraries SET(EXTERNAL_LIBS "") -SET(TARGET_NAME "zetaglest") +SET(TARGET_NAME "glest") SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6") -IF(BUILD_ZETAGLEST) +IF(BUILD_GLEST) MESSAGE(STATUS "Build ${TARGET_NAME} = YES") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=gnu++11") @@ -127,8 +127,8 @@ IF(BUILD_ZETAGLEST) ENDIF() ######################################################################################### - # zetaglest game - SET(ZG_SOURCE_FILES "") + # game + SET(GLEST_SOURCE_FILES "") # libircclient IF(FORCE_EMBEDDED_LIBS) SET(FORCE_USE_EMBEDDED_Ircclient ON) @@ -143,7 +143,7 @@ IF(BUILD_ZETAGLEST) if(NOT IRCCLIENT_FOUND OR FORCE_USE_EMBEDDED_Ircclient) message(STATUS "Using included libbircclient sources") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/external/libircclient/src/libircclient.c) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/external/libircclient/src/libircclient.c) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/external/libircclient/include) else() MESSAGE(STATUS "*** Using libircclient found in [${IRCCLIENT_INCLUDE_DIR}] IRCCLIENT_FOUND [${IRCCLIENT_FOUND}] IRCCLIENT_LIBRARY [${IRCCLIENT_LIBRARY}]") @@ -211,19 +211,19 @@ IF(BUILD_ZETAGLEST) set(SRC_DIR_TO_GLOB ${DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.c) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB INCLUDE_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.h) - SET(ZG_INCLUDE_FILES ${ZG_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR}) + SET(GLEST_INCLUDE_FILES ${GLEST_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR}) IF(APPLE) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.m) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) ENDIF(APPLE) ENDFOREACH(DIR) @@ -231,13 +231,13 @@ IF(BUILD_ZETAGLEST) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-subsystem,console -mconsole") ENDIF() - SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) + SET_SOURCE_FILES_PROPERTIES(${GLEST_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) - ADD_EXECUTABLE(${TARGET_NAME} ${ZG_SOURCE_FILES} ${ZG_INCLUDE_FILES}) + ADD_EXECUTABLE(${TARGET_NAME} ${GLEST_SOURCE_FILES} ${GLEST_INCLUDE_FILES}) - SET(ZG_STREFLOP "") + SET(GLEST_STREFLOP "") IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND) - SET(ZG_STREFLOP "streflop") + SET(GLEST_STREFLOP "streflop") ENDIF() if(WANT_USE_GoogleBreakpad) @@ -254,14 +254,14 @@ IF(BUILD_ZETAGLEST) endif() IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${ZG_STREFLOP} libzetaglest stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${GLEST_STREFLOP} libglest stdc++ moldname mingwex msvcrt user32 kernel32) ENDIF() IF(NOT WIN32) IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND) - TARGET_LINK_LIBRARIES(${TARGET_NAME} ${ZG_STREFLOP}) + TARGET_LINK_LIBRARIES(${TARGET_NAME} ${GLEST_STREFLOP}) ENDIF() - TARGET_LINK_LIBRARIES(${TARGET_NAME} libzetaglest) + TARGET_LINK_LIBRARIES(${TARGET_NAME} libglest) ENDIF() TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) @@ -275,7 +275,7 @@ IF(BUILD_ZETAGLEST) IF(UNIX) INSTALL(PROGRAMS - "${PROJECT_SOURCE_DIR}/mk/linux/start_zetaglest_gameserver" + "${PROJECT_SOURCE_DIR}/mk/linux/start_gameserver" DESTINATION ${INSTALL_DIR_INI}) ENDIF() INSTALL(FILES @@ -297,16 +297,16 @@ IF(BUILD_ZETAGLEST) IF(UNIX AND APPLE) INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.icns" + "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/Glest.icns" DESTINATION ${INSTALL_DIR_ICON}) ENDIF() # Installation of icon INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/shared/zetaglest.ico" + "${PROJECT_SOURCE_DIR}/mk/shared/glest.ico" DESTINATION ${INSTALL_DIR_INI}) - # These files must be in the same directory as the zetaglest binary + # These files must be in the same directory as the glest binary # when "make install" is NOT used. # # diff --git a/source/glest_game/Doxyfile b/source/game/Doxyfile similarity index 99% rename from source/glest_game/Doxyfile rename to source/game/Doxyfile index 12d9c1029..dc705e031 100644 --- a/source/glest_game/Doxyfile +++ b/source/game/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "MegaGlest" +PROJECT_NAME = "Glest" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/source/glest_game/ai/ai.cpp b/source/game/ai/ai.cpp similarity index 98% rename from source/glest_game/ai/ai.cpp rename to source/game/ai/ai.cpp index 535414822..5bfe17cf9 100644 --- a/source/glest_game/ai/ai.cpp +++ b/source/game/ai/ai.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -343,13 +343,13 @@ namespace Game { //printf("Discovered overriden static value for AI, minMinWarriorsExpandCpuEasy = %d\n",minMinWarriorsExpandCpuEasy); } if (faction-> - getAIBehaviorStaticOverideValue(aibsvcMinMinWarriorsExpandCpuZeta) + getAIBehaviorStaticOverideValue(aibsvcMinMinWarriorsExpandCpuGlest) != INT_MAX) { - minMinWarriorsExpandCpuZeta = + minMinWarriorsExpandCpuGlest = faction-> getAIBehaviorStaticOverideValue - (aibsvcMinMinWarriorsExpandCpuZeta); - //printf("Discovered overriden static value for AI, minMinWarriorsExpandCpuZeta = %d\n",minMinWarriorsExpandCpuZeta); + (aibsvcMinMinWarriorsExpandCpuGlest); + //printf("Discovered overriden static value for AI, minMinWarriorsExpandCpuGlest = %d\n",minMinWarriorsExpandCpuGlest); } if (faction-> getAIBehaviorStaticOverideValue(aibsvcMinMinWarriorsExpandCpuUltra) @@ -1163,10 +1163,10 @@ namespace Game { ultraResourceAttack = (aiInterface->getControlType() == ctCpuUltra) && random.randRange(0, 2) == 1; bool - zetaResourceAttack = (aiInterface->getControlType() == ctCpuZeta) + glestResourceAttack = (aiInterface->getControlType() == ctCpuGlest) && random.randRange(0, 1) == 1; - if (zetaResourceAttack || ultraResourceAttack) { + if (glestResourceAttack || ultraResourceAttack) { Map * map = aiInterface->getMap(); @@ -1285,7 +1285,7 @@ namespace Game { const AttackCommandType * act = unit->getType()->getFirstAttackCommand(field); - if (aiInterface->getControlType() == ctCpuZeta) { + if (aiInterface->getControlType() == ctCpuGlest) { if (producerWarriorCount > maxProducerWarriors) { if (unit->getCommandSize() > 0 && unit->getCurrCommand()->getCommandType() != NULL @@ -1321,7 +1321,7 @@ namespace Game { if (alreadyAttacking == false && unit->getType()->hasSkillClass(scAttack) && (aiInterface->getControlType() == ctCpuUltra - || aiInterface->getControlType() == ctCpuZeta)) { + || aiInterface->getControlType() == ctCpuGlest)) { //printf("~~~~~~~~ Unit [%s - %d] checking if unit is being attacked\n",unit->getFullName().c_str(),unit->getId()); std::pair < bool, Unit * >beingAttacked = @@ -1411,8 +1411,8 @@ namespace Game { } } - // Zeta CPU does not send ( far away ) units which are currently producing something - if (aiInterface->getControlType() == ctCpuZeta) { + // Glest CPU does not send ( far away ) units which are currently producing something + if (aiInterface->getControlType() == ctCpuGlest) { if (!isWarrior) { if (!productionInProgress) { shouldAttack = false; @@ -1433,8 +1433,8 @@ namespace Game { if (aiInterface->getControlType() == ctCpuEasy) { minWarriors += minMinWarriorsExpandCpuEasy; - } else if (aiInterface->getControlType() == ctCpuZeta) { - minWarriors += minMinWarriorsExpandCpuZeta; + } else if (aiInterface->getControlType() == ctCpuGlest) { + minWarriors += minMinWarriorsExpandCpuGlest; if (minWarriors > maxMinWarriors - 1 || randomMinWarriorsReached) { randomMinWarriorsReached = true; minWarriors = @@ -1845,9 +1845,9 @@ namespace Game { aiNode->addAttribute("minMinWarriorsExpandCpuEasy", intToStr(minMinWarriorsExpandCpuEasy), mapTagReplacements); - // int minMinWarriorsExpandCpuZeta; - aiNode->addAttribute("minMinWarriorsExpandCpuZeta", - intToStr(minMinWarriorsExpandCpuZeta), + // int minMinWarriorsExpandCpuGlest; + aiNode->addAttribute("minMinWarriorsExpandCpuGlest", + intToStr(minMinWarriorsExpandCpuGlest), mapTagReplacements); // int minMinWarriorsExpandCpuUltra; aiNode->addAttribute("minMinWarriorsExpandCpuUltra", @@ -1944,9 +1944,9 @@ namespace Game { // int minMinWarriorsExpandCpuEasy; minMinWarriorsExpandCpuEasy = aiNode->getAttribute("minMinWarriorsExpandCpuEasy")->getIntValue(); - // int minMinWarriorsExpandCpZeta; - minMinWarriorsExpandCpuZeta = - aiNode->getAttribute("minMinWarriorsExpandCpuZeta")->getIntValue(); + // int minMinWarriorsExpandCpGlest; + minMinWarriorsExpandCpuGlest = + aiNode->getAttribute("minMinWarriorsExpandCpuGlest")->getIntValue(); // int minMinWarriorsExpandCpuUltra; minMinWarriorsExpandCpuUltra = aiNode->getAttribute("minMinWarriorsExpandCpuUltra")->getIntValue(); diff --git a/source/glest_game/ai/ai.h b/source/game/ai/ai.h similarity index 96% rename from source/glest_game/ai/ai.h rename to source/game/ai/ai.h index fb2e39b9c..aad7a7fd5 100644 --- a/source/glest_game/ai/ai.h +++ b/source/game/ai/ai.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -221,7 +221,7 @@ namespace Game { int minMinWarriorsExpandCpuEasy; int - minMinWarriorsExpandCpuZeta; + minMinWarriorsExpandCpuGlest; int minMinWarriorsExpandCpuUltra; int @@ -292,7 +292,7 @@ namespace Game { maxBuildRadius = 40; minMinWarriors = 7; minMinWarriorsExpandCpuEasy = 1; - minMinWarriorsExpandCpuZeta = 3; + minMinWarriorsExpandCpuGlest = 3; minMinWarriorsExpandCpuUltra = 3; minMinWarriorsExpandCpuNormal = 3; maxMinWarriors = 20; diff --git a/source/glest_game/ai/ai_interface.cpp b/source/game/ai/ai_interface.cpp similarity index 99% rename from source/glest_game/ai/ai_interface.cpp rename to source/game/ai/ai_interface.cpp index 930e30107..ad6ff5dbe 100644 --- a/source/glest_game/ai/ai_interface.cpp +++ b/source/game/ai/ai_interface.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -330,7 +330,7 @@ namespace Game { "]"); } fprintf(fp, - "ZetaGlest AI log file for Tech [%s] Faction [%s] #%d\n\n", + "Glest AI log file for Tech [%s] Faction [%s] #%d\n\n", this->gameSettings->getTech().c_str(), this->world->getFaction(this->factionIndex)->getType()-> getName().c_str(), this->factionIndex); diff --git a/source/glest_game/ai/ai_interface.h b/source/game/ai/ai_interface.h similarity index 97% rename from source/glest_game/ai/ai_interface.h rename to source/game/ai/ai_interface.h index a5f9a16af..b9f5a27c2 100644 --- a/source/glest_game/ai/ai_interface.h +++ b/source/game/ai/ai_interface.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/ai/ai_rule.cpp b/source/game/ai/ai_rule.cpp similarity index 99% rename from source/glest_game/ai/ai_rule.cpp rename to source/game/ai/ai_rule.cpp index fc4923485..73f2c0e76 100644 --- a/source/glest_game/ai/ai_rule.cpp +++ b/source/game/ai/ai_rule.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -516,7 +516,7 @@ namespace Game { } // The following rules are specific creation rules for different AI. else { - if (ai->getAiInterface()->getControlType() == ctCpuZeta) { + if (ai->getAiInterface()->getControlType() == ctCpuGlest) { if (ai->outputAIBehaviourToConsole()) printf ("AAA AiRuleAddTasks adding #1 workerCount = %d[%.2f], buildingCount = %d[%.2f] warriorCount = %d[%.2f] upgradeCount = %d RULE Name[%s]\n", @@ -1773,7 +1773,7 @@ namespace Game { producers = idle_producers; } - if (aiInterface->getControlType() == ctCpuZeta) { // zeta cpu trys to balance the commands to the producers + if (aiInterface->getControlType() == ctCpuGlest) { // cpu trys to balance the commands to the producers int randomstart = ai->getRandom()->randRange(0, @@ -2038,7 +2038,7 @@ namespace Game { if (ai->outputAIBehaviourToConsole()) printf - ("zeta #1 produceSpecific giveCommand to unit [%s] commandType [%s]\n", + ("CPU #1 produceSpecific giveCommand to unit [%s] commandType [%s]\n", aiInterface->getMyUnit(bestIndex)-> getType()->getName().c_str(), ut->getCommandType(commandIndex)-> @@ -2048,7 +2048,7 @@ namespace Game { char szBuf[8096] = ""; snprintf(szBuf, 8096, - "zeta #1 produceSpecific giveCommand to unit [%s] commandType [%s]", + "CPU #1 produceSpecific giveCommand to unit [%s] commandType [%s]", aiInterface-> getMyUnit(bestIndex)-> getType()->getName(). @@ -2110,7 +2110,7 @@ namespace Game { if (ai->outputAIBehaviourToConsole()) printf - ("zeta #2 produceSpecific giveCommand to unit [%s] commandType [%s]\n", + ("CPU #2 produceSpecific giveCommand to unit [%s] commandType [%s]\n", aiInterface->getMyUnit(bestIndex)-> getType()->getName().c_str(), (defCt != @@ -2120,7 +2120,7 @@ namespace Game { char szBuf[8096] = ""; snprintf(szBuf, 8096, - "zeta #2 produceSpecific giveCommand to unit [%s] commandType [%s]", + "CPU #2 produceSpecific giveCommand to unit [%s] commandType [%s]", aiInterface-> getMyUnit(bestIndex)-> getType()->getName().c_str(), @@ -2179,7 +2179,7 @@ namespace Game { if (ai->outputAIBehaviourToConsole()) printf - ("zeta #3 produceSpecific giveCommand to unit [%s] commandType [%s]\n", + ("CPU #3 produceSpecific giveCommand to unit [%s] commandType [%s]\n", aiInterface->getMyUnit(bestIndex)-> getType()->getName().c_str(), (defCt != @@ -2189,7 +2189,7 @@ namespace Game { char szBuf[8096] = ""; snprintf(szBuf, 8096, - "zeta #3 produceSpecific giveCommand to unit [%s] commandType [%s]", + "CPU #3 produceSpecific giveCommand to unit [%s] commandType [%s]", aiInterface-> getMyUnit(bestIndex)-> getType()->getName().c_str(), @@ -2241,7 +2241,7 @@ namespace Game { } if (ai->outputAIBehaviourToConsole()) printf - ("zeta #4 produceSpecific giveCommand to unit [%s] commandType [%s]\n", + ("CPU #4 produceSpecific giveCommand to unit [%s] commandType [%s]\n", aiInterface->getMyUnit(bestIndex)-> getType()->getName().c_str(), (defCt != @@ -2250,7 +2250,7 @@ namespace Game { char szBuf[8096] = ""; snprintf(szBuf, 8096, - "zeta #4 produceSpecific giveCommand to unit [%s] commandType [%s]", + "CPU #4 produceSpecific giveCommand to unit [%s] commandType [%s]", aiInterface->getMyUnit(bestIndex)-> getType()->getName().c_str(), (defCt != diff --git a/source/glest_game/ai/ai_rule.h b/source/game/ai/ai_rule.h similarity index 98% rename from source/glest_game/ai/ai_rule.h rename to source/game/ai/ai_rule.h index 7343e38d6..d3fa61f05 100644 --- a/source/glest_game/ai/ai_rule.h +++ b/source/game/ai/ai_rule.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/ai/path_finder.cpp b/source/game/ai/path_finder.cpp similarity index 99% rename from source/glest_game/ai/path_finder.cpp rename to source/game/ai/path_finder.cpp index 61610ea02..19c8bb9eb 100644 --- a/source/glest_game/ai/path_finder.cpp +++ b/source/game/ai/path_finder.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/ai/path_finder.h b/source/game/ai/path_finder.h similarity index 99% rename from source/glest_game/ai/path_finder.h rename to source/game/ai/path_finder.h index d0737af09..cc86ebe9b 100644 --- a/source/glest_game/ai/path_finder.h +++ b/source/game/ai/path_finder.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/facilities/.gitignore b/source/game/facilities/.gitignore similarity index 100% rename from source/glest_game/facilities/.gitignore rename to source/game/facilities/.gitignore diff --git a/source/glest_game/facilities/auto_test.cpp b/source/game/facilities/auto_test.cpp similarity index 95% rename from source/glest_game/facilities/auto_test.cpp rename to source/game/facilities/auto_test.cpp index 0a52fd8cb..c4a35919c 100644 --- a/source/glest_game/facilities/auto_test.cpp +++ b/source/game/facilities/auto_test.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/facilities/auto_test.h b/source/game/facilities/auto_test.h similarity index 93% rename from source/glest_game/facilities/auto_test.h rename to source/game/facilities/auto_test.h index f70a06b4d..81144b137 100644 --- a/source/glest_game/facilities/auto_test.h +++ b/source/game/facilities/auto_test.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/facilities/components.cpp b/source/game/facilities/components.cpp similarity index 99% rename from source/glest_game/facilities/components.cpp rename to source/game/facilities/components.cpp index 27c6e72d8..a58af905b 100644 --- a/source/glest_game/facilities/components.cpp +++ b/source/game/facilities/components.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/facilities/components.h b/source/game/facilities/components.h similarity index 98% rename from source/glest_game/facilities/components.h rename to source/game/facilities/components.h index 496a13303..10e4083ef 100644 --- a/source/glest_game/facilities/components.h +++ b/source/game/facilities/components.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/facilities/game_util.cpp b/source/game/facilities/game_util.cpp similarity index 94% rename from source/glest_game/facilities/game_util.cpp rename to source/game/facilities/game_util.cpp index 859159b82..7b1d0081c 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/game/facilities/game_util.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ using namespace Shared::Util; using namespace Shared::Platform; namespace Game { - const char *mailString = "https://github.com/ZetaGlest"; + const char *mailString = "https://github.com/Glest"; string getCrashDumpFileName() { return GameVersionString + ".dmp"; @@ -168,16 +168,15 @@ namespace Game { } string getAboutString1(int i) { - //case 1: return "Built: " + string(__DATE__) + " " + GIT_Rev; switch (i) { case 0: return GameVersionString + " (build " + GameBuildDateString + ")"; case 1: return "Network multiplayer cross-platform 3D real-time strategy (RTS) game"; case 2: - return "Copyright 2001-2010 The Glest Team"; + return "Open-source and distributed under GPL 3 free license"; case 3: - return "Copyright 2018 The ZetaGlest Team"; + return "Copyright 2001-2019 The Glest Team"; } return ""; } @@ -185,11 +184,11 @@ namespace Game { string getAboutString2(int i) { switch (i) { case 0: - return "Website: https://zetaglest.github.io"; + return "Website: https://glest.github.io"; case 1: - return "Bug reports: " + string(mailString); + return "Discord: https://discord.gg/WaAaXS7"; case 2: - return "IRC: irc://irc.freenode.net/zegaglest-dev"; + return "Bug reports: " + string(mailString); } return ""; } @@ -237,9 +236,9 @@ namespace Game { case 6: return lang.getString("LinuxPort"); case 7: - return lang.getString("Megaglest3d2dProgramming"); + return lang.getString("Glest3d2dProgramming"); case 8: - return lang.getString("MegaglestProgramming"); + return lang.getString("GlestProgramming"); } return ""; } diff --git a/source/glest_game/facilities/game_util.h b/source/game/facilities/game_util.h similarity index 90% rename from source/glest_game/facilities/game_util.h rename to source/game/facilities/game_util.h index ed119bf7c..55ea788e7 100644 --- a/source/glest_game/facilities/game_util.h +++ b/source/game/facilities/game_util.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/facilities/logger.cpp b/source/game/facilities/logger.cpp similarity index 98% rename from source/glest_game/facilities/logger.cpp rename to source/game/facilities/logger.cpp index d95d584b8..8f5791faf 100644 --- a/source/glest_game/facilities/logger.cpp +++ b/source/game/facilities/logger.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/facilities/logger.h b/source/game/facilities/logger.h similarity index 94% rename from source/glest_game/facilities/logger.h rename to source/game/facilities/logger.h index cd5cc0e12..10597df43 100644 --- a/source/glest_game/facilities/logger.h +++ b/source/game/facilities/logger.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/chat_manager.cpp b/source/game/game/chat_manager.cpp similarity index 99% rename from source/glest_game/game/chat_manager.cpp rename to source/game/game/chat_manager.cpp index 6f8e282f7..0b3244889 100644 --- a/source/glest_game/game/chat_manager.cpp +++ b/source/game/game/chat_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/chat_manager.h b/source/game/game/chat_manager.h similarity index 95% rename from source/glest_game/game/chat_manager.h rename to source/game/game/chat_manager.h index 3ec0b1fe7..686f7a09f 100644 --- a/source/glest_game/game/chat_manager.h +++ b/source/game/game/chat_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/commander.cpp b/source/game/game/commander.cpp similarity index 99% rename from source/glest_game/game/commander.cpp rename to source/game/game/commander.cpp index 4a929d8ac..255fd4881 100644 --- a/source/glest_game/game/commander.cpp +++ b/source/game/game/commander.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -1343,14 +1343,14 @@ namespace Game { // world->getFaction(factionIndex)->getPersonalityType(),world->getFaction(factionIndex)->getIndex(),world->getFaction(factionIndex)->getControlType(),settings->getNetworkPlayerStatuses(factionIndex)); //printf("#2 nctPlayerStatusChange factionIndex = %d playerStatus = %d\n",factionIndex,playerStatus); - settings->setFactionControl(factionIndex, ctCpuZeta); + settings->setFactionControl(factionIndex, ctCpuGlest); settings->setResourceMultiplierIndex(factionIndex, settings->getFallbackCpuMultiplierIndex()); world->getStats()->setResourceMultiplier(factionIndex, (settings->getFallbackCpuMultiplierIndex() + 1) * 0.5f); //Game *game = this->world->getGame(); //game->get Faction * faction = this->world->getFaction(factionIndex); - faction->setControlType(ctCpuZeta); + faction->setControlType(ctCpuGlest); if (!world->getGame()->getGameOver() && !this->world->getGame()-> diff --git a/source/glest_game/game/commander.h b/source/game/game/commander.h similarity index 96% rename from source/glest_game/game/commander.h rename to source/game/game/commander.h index 92b6b396f..609fd9a6e 100644 --- a/source/glest_game/game/commander.h +++ b/source/game/game/commander.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/console.cpp b/source/game/game/console.cpp similarity index 97% rename from source/glest_game/game/console.cpp rename to source/game/game/console.cpp index 670ce10e0..fce3cb7ab 100644 --- a/source/glest_game/game/console.cpp +++ b/source/game/game/console.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/console.h b/source/game/game/console.h similarity index 96% rename from source/glest_game/game/console.h rename to source/game/game/console.h index 02e819f5e..d15e282ae 100644 --- a/source/glest_game/game/console.h +++ b/source/game/game/console.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/game.cpp b/source/game/game/game.cpp similarity index 99% rename from source/glest_game/game/game.cpp rename to source/game/game/game.cpp index 8aad9a10d..36fcb1491 100644 --- a/source/glest_game/game/game.cpp +++ b/source/game/game/game.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -7550,8 +7550,8 @@ namespace Game { case ctCpuUltra: factionInfo += " CPU Ultra" + multiplier; break; - case ctCpuZeta: - factionInfo += " CPU Zeta" + multiplier; + case ctCpuGlest: + factionInfo += " CPU Glest" + multiplier; break; default: break; @@ -8707,7 +8707,7 @@ namespace Game { std::map < string, string > mapTagReplacements; XmlTree xmlTreeSaveGame(XML_RAPIDXML_ENGINE); - xmlTreeSaveGame.init("zetaglest-saved-game"); + xmlTreeSaveGame.init("glest-saved-game"); XmlNode *rootNodeReplay = xmlTreeSaveGame.getRootNode(); //std::map mapTagReplacements; @@ -8744,7 +8744,7 @@ namespace Game { } XmlTree xmlTree; - xmlTree.init("zetaglest-saved-game"); + xmlTree.init("glest-saved-game"); XmlNode *rootNode = xmlTree.getRootNode(); std::map < string, string > mapTagReplacements; @@ -8982,11 +8982,11 @@ namespace Game { const XmlNode *rootNode = xmlTreeReplay.getRootNode(); - if (rootNode->hasChild("zetaglest-saved-game") == true) { - rootNode = rootNode->getChild("zetaglest-saved-game"); + if (rootNode->hasChild("glest-saved-game") == true) { + rootNode = rootNode->getChild("glest-saved-game"); } - //const XmlNode *versionNode= rootNode->getChild("zetaglest-saved-game"); + //const XmlNode *versionNode= rootNode->getChild("glest-saved-game"); const XmlNode *versionNode = rootNode; Lang & lang = Lang::getInstance(); @@ -9067,11 +9067,11 @@ namespace Game { printf("After load of XML\n"); const XmlNode *rootNode = xmlTree.getRootNode(); - if (rootNode->hasChild("zetaglest-saved-game") == true) { - rootNode = rootNode->getChild("zetaglest-saved-game"); + if (rootNode->hasChild("glest-saved-game") == true) { + rootNode = rootNode->getChild("glest-saved-game"); } - //const XmlNode *versionNode= rootNode->getChild("zetaglest-saved-game"); + //const XmlNode *versionNode= rootNode->getChild("glest-saved-game"); const XmlNode *versionNode = rootNode; Lang & lang = Lang::getInstance(); diff --git a/source/glest_game/game/game.h b/source/game/game/game.h similarity index 98% rename from source/glest_game/game/game.h rename to source/game/game/game.h index 5cab5709d..397fffde4 100644 --- a/source/glest_game/game/game.h +++ b/source/game/game/game.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/game_camera.cpp b/source/game/game/game_camera.cpp similarity index 99% rename from source/glest_game/game/game_camera.cpp rename to source/game/game/game_camera.cpp index 7c444c5dc..ec858ccd5 100644 --- a/source/glest_game/game/game_camera.cpp +++ b/source/game/game/game_camera.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/game_camera.h b/source/game/game/game_camera.h similarity index 96% rename from source/glest_game/game/game_camera.h rename to source/game/game/game_camera.h index 78eb3df21..7b0562bc3 100644 --- a/source/glest_game/game/game_camera.h +++ b/source/game/game/game_camera.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/game_constants.h b/source/game/game/game_constants.h similarity index 97% rename from source/glest_game/game/game_constants.h rename to source/game/game/game_constants.h index 7fdfb50b0..51dd9545c 100644 --- a/source/glest_game/game/game_constants.h +++ b/source/game/game/game_constants.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -136,7 +136,7 @@ namespace Game { ctCpuEasy, ctCpu, ctCpuUltra, - ctCpuZeta, + ctCpuGlest, ctNetwork, ctHuman }; @@ -260,7 +260,7 @@ namespace Game { static const float ultraMultiplier; static const float - zetaMultiplier; + glestMultiplier; // static const char * diff --git a/source/glest_game/game/game_settings.h b/source/game/game/game_settings.h similarity index 99% rename from source/glest_game/game/game_settings.h rename to source/game/game/game_settings.h index cdcad3be0..18fdde4e0 100644 --- a/source/glest_game/game/game_settings.h +++ b/source/game/game/game_settings.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/script_manager.cpp b/source/game/game/script_manager.cpp similarity index 99% rename from source/glest_game/game/script_manager.cpp rename to source/game/game/script_manager.cpp index 8455b3583..f3825b776 100644 --- a/source/glest_game/game/script_manager.cpp +++ b/source/game/game/script_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -579,13 +579,13 @@ namespace Game { // string sandboxScriptFilename = data_path + "data/core/scripts/sandbox.lua"; // string sandboxLuaCode = getFileTextContents(sandboxScriptFilename); // - // //luaScript.loadCode(sandboxLuaCode + "\n", "zetaglest_lua_sandbox"); + // //luaScript.loadCode(sandboxLuaCode + "\n", "glest_lua_sandbox"); // luaScript.setSandboxWrapperFunctionName("runsandboxed"); // luaScript.setSandboxCode(sandboxLuaCode); // luaScript.runCode(sandboxLuaCode); // // Setup the lua security sandbox here - // luaScript.beginCall("zetaglest_lua_sandbox"); + // luaScript.beginCall("glest_lua_sandbox"); // luaScript.endCall(); //setup message box diff --git a/source/glest_game/game/script_manager.h b/source/game/game/script_manager.h similarity index 99% rename from source/glest_game/game/script_manager.h rename to source/game/game/script_manager.h index 2a55f39af..3d6f8dc09 100644 --- a/source/glest_game/game/script_manager.h +++ b/source/game/game/script_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/game/stats.cpp b/source/game/game/stats.cpp similarity index 98% rename from source/glest_game/game/stats.cpp rename to source/game/game/stats.cpp index bfeb10158..edf20ed45 100644 --- a/source/glest_game/game/stats.cpp +++ b/source/game/game/stats.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ namespace Game { break; case ctCpuUltra:controlString = lang.getString("CpuUltra"); break; - case ctCpuZeta:controlString = lang.getString("CpuZeta"); + case ctCpuGlest:controlString = lang.getString("CpuGlest"); break; case ctNetwork:controlString = lang.getString("Network"); break; diff --git a/source/glest_game/game/stats.h b/source/game/game/stats.h similarity index 97% rename from source/glest_game/game/stats.h rename to source/game/game/stats.h index a8cd10990..8386f6d7c 100644 --- a/source/glest_game/game/stats.h +++ b/source/game/game/stats.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/global/config.cpp b/source/game/global/config.cpp similarity index 97% rename from source/glest_game/global/config.cpp rename to source/game/global/config.cpp index 348f21e55..746fa22dd 100644 --- a/source/glest_game/global/config.cpp +++ b/source/game/global/config.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ namespace Game { const float GameConstants::normalMultiplier = 1.0f; const float GameConstants::easyMultiplier = 0.5f; const float GameConstants::ultraMultiplier = 1.5f; - const float GameConstants::zetaMultiplier = 2.5f; + const float GameConstants::glestMultiplier = 2.5f; const char *GameConstants::folder_path_maps = "maps"; const char *GameConstants::folder_path_scenarios = "scenarios"; @@ -67,7 +67,7 @@ namespace Game { "factionPreviewTextureCache"; const char *GameConstants::characterMenuScreenPositionListCacheLookupKey = "characterMenuScreenPositionListCache"; - const char *GameConstants::application_name = "ZetaGlest"; + const char *GameConstants::application_name = "Glest"; const char *GameConstants::LOADING_SCREEN_FILE = "loading_screen"; const char *GameConstants::LOADING_SCREEN_FILE_FILTER = @@ -85,19 +85,19 @@ namespace Game { const char *GameConstants::path_logs_CacheLookupKey = "logs"; const char *GameConstants::saveNetworkGameFileServer = - "zetaglest-saved-server.xml"; + "glest-saved-server.xml"; const char *GameConstants::saveNetworkGameFileServerCompressed = - "zetaglest-saved-server.zip"; + "glest-saved-server.zip"; const char *GameConstants::saveNetworkGameFileClient = - "zetaglest-saved-client.xml"; + "glest-saved-client.xml"; const char *GameConstants::saveNetworkGameFileClientCompressed = - "zetaglest-saved-client.zip"; + "glest-saved-client.zip"; - const char *GameConstants::saveGameFileDefault = "zetaglest-saved.xml"; + const char *GameConstants::saveGameFileDefault = "glest-saved.xml"; const char *GameConstants::saveGameFileAutoTestDefault = - "zetaglest-auto-saved_%s.xml"; - const char *GameConstants::saveGameFilePattern = "zetaglest-saved_%s.xml"; + "glest-auto-saved_%s.xml"; + const char *GameConstants::saveGameFilePattern = "glest-saved_%s.xml"; const char *Config::glest_ini_filename = "glest.ini"; const char *Config::glestuser_ini_filename = "glestuser.ini"; @@ -227,20 +227,20 @@ namespace Game { #if defined(__linux__) if (foundPath == false) { foundPath = - tryCustomPath(cfgType, fileName, "/usr/share/zetaglest/"); + tryCustomPath(cfgType, fileName, "/usr/share/glest/"); } if (foundPath == false) { foundPath = - tryCustomPath(cfgType, fileName, "/usr/share/games/zetaglest/"); + tryCustomPath(cfgType, fileName, "/usr/share/games/glest/"); } if (foundPath == false) { foundPath = - tryCustomPath(cfgType, fileName, "/usr/local/share/zetaglest/"); + tryCustomPath(cfgType, fileName, "/usr/local/share/glest/"); } if (foundPath == false) { foundPath = tryCustomPath(cfgType, fileName, - "/usr/local/share/games/zetaglest/"); + "/usr/local/share/games/glest/"); } #endif diff --git a/source/glest_game/global/config.h b/source/game/global/config.h similarity index 96% rename from source/glest_game/global/config.h rename to source/game/global/config.h index b0ff3954d..541208c33 100644 --- a/source/glest_game/global/config.h +++ b/source/game/global/config.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/global/core_data.cpp b/source/game/global/core_data.cpp similarity index 99% rename from source/glest_game/global/core_data.cpp rename to source/game/global/core_data.cpp index df0ab31b1..d5e96880c 100644 --- a/source/glest_game/global/core_data.cpp +++ b/source/game/global/core_data.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -317,7 +317,7 @@ namespace Game { Texture2D *CoreData::getLogoTexture() { string data_path = getDataPath(); loadTextureIfRequired(&logoTexture, data_path, - CORE_MENU_TEXTURES_PATH + "logo.tga", + CORE_MENU_TEXTURES_PATH + "logo.png", tsyst_logoTexture, false, false, false); return logoTexture; @@ -498,7 +498,7 @@ namespace Game { for (int index = 0; index < (int) logoFilenames.size(); ++index) { string logo = logoFilenames[index]; - if (strcmp("logo.tga", logo.c_str()) != 0) { + if (strcmp("logo.png", logo.c_str()) != 0) { Texture2D *logoTextureExtra = NULL; loadTextureIfRequired(&logoTextureExtra, data_path, @@ -516,7 +516,7 @@ namespace Game { for (int index = 0; index < (int) logoFilenames.size(); ++index) { string logo = logoFilenames[index]; - if (strcmp("logo.tga", logo.c_str()) != 0) { + if (strcmp("logo.png", logo.c_str()) != 0) { Texture2D *logoTextureExtra = NULL; loadTextureIfRequired(&logoTextureExtra, data_path, diff --git a/source/glest_game/global/core_data.h b/source/game/global/core_data.h similarity index 97% rename from source/glest_game/global/core_data.h rename to source/game/global/core_data.h index b65ceb1a1..b7e16c98a 100644 --- a/source/glest_game/global/core_data.h +++ b/source/game/global/core_data.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -198,7 +198,7 @@ namespace Game { StrSound *getMenuMusic(); // When issue #63 was done - // + // // and the PlaySoundFile class was created, // these functions were kept because they were being called from many // different places in the code base. Rather than trying to change diff --git a/source/glest_game/global/lang.cpp b/source/game/global/lang.cpp similarity index 99% rename from source/glest_game/global/lang.cpp rename to source/game/global/lang.cpp index 777595670..72bf5b028 100644 --- a/source/glest_game/global/lang.cpp +++ b/source/game/global/lang.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/global/lang.h b/source/game/global/lang.h similarity index 95% rename from source/glest_game/global/lang.h rename to source/game/global/lang.h index ba2d7c5c4..5c8edab08 100644 --- a/source/glest_game/global/lang.h +++ b/source/game/global/lang.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/global/metrics.cpp b/source/game/global/metrics.cpp similarity index 94% rename from source/glest_game/global/metrics.cpp rename to source/game/global/metrics.cpp index 07a75eb68..0d83a67c0 100644 --- a/source/glest_game/global/metrics.cpp +++ b/source/game/global/metrics.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/global/metrics.h b/source/game/global/metrics.h similarity index 93% rename from source/glest_game/global/metrics.h rename to source/game/global/metrics.h index 696844980..01b4d1511 100644 --- a/source/glest_game/global/metrics.h +++ b/source/game/global/metrics.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/graphics/particle_type.cpp b/source/game/graphics/particle_type.cpp similarity index 99% rename from source/glest_game/graphics/particle_type.cpp rename to source/game/graphics/particle_type.cpp index 6eefc23af..7a2ed9eca 100644 --- a/source/glest_game/graphics/particle_type.cpp +++ b/source/game/graphics/particle_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/graphics/particle_type.h b/source/game/graphics/particle_type.h similarity index 96% rename from source/glest_game/graphics/particle_type.h rename to source/game/graphics/particle_type.h index afb10b6c3..9552386bf 100644 --- a/source/glest_game/graphics/particle_type.h +++ b/source/game/graphics/particle_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/graphics/renderer.cpp b/source/game/graphics/renderer.cpp similarity index 99% rename from source/glest_game/graphics/renderer.cpp rename to source/game/graphics/renderer.cpp index 7410a3a3f..8722ae824 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/game/graphics/renderer.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -7855,7 +7855,7 @@ namespace Game { message += "Your system supports OpenGL version ["; message += getGlVersion() + string("]\n"); - message += "ZetaGlest needs a version that supports\n"; + message += "Glest needs a version that supports\n"; message += "glActiveTexture (OpenGL 1.3) or the ARB_multitexture extension."; throw game_runtime_error(message.c_str(), true); @@ -7867,7 +7867,7 @@ namespace Game { message += "Your system supports OpenGL version ["; message += getGlVersion() + string("]\n"); - message += "ZetaGlest needs at least version 2.1 to work\n"; + message += "Glest needs at least version 2.1 to work\n"; message += "You may solve this problem by installing your latest video card drivers"; throw game_runtime_error(message.c_str(), true); @@ -7876,7 +7876,7 @@ namespace Game { //opengl 1.4 or extension //if(!isGlVersionSupported(1, 4, 0)){ if (glewIsSupported("GL_VERSION_1_4") == false) { - checkExtension("GL_ARB_texture_env_crossbar", "ZetaGlest"); + checkExtension("GL_ARB_texture_env_crossbar", "Glest"); } } diff --git a/source/glest_game/graphics/renderer.h b/source/game/graphics/renderer.h similarity index 99% rename from source/glest_game/graphics/renderer.h rename to source/game/graphics/renderer.h index 7e061dbb5..dff1c48d3 100644 --- a/source/glest_game/graphics/renderer.h +++ b/source/game/graphics/renderer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/graphics/unit_particle_type.cpp b/source/game/graphics/unit_particle_type.cpp similarity index 98% rename from source/glest_game/graphics/unit_particle_type.cpp rename to source/game/graphics/unit_particle_type.cpp index 3df6c0f4b..4d1f147e0 100644 --- a/source/glest_game/graphics/unit_particle_type.cpp +++ b/source/game/graphics/unit_particle_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/graphics/unit_particle_type.h b/source/game/graphics/unit_particle_type.h similarity index 95% rename from source/glest_game/graphics/unit_particle_type.h rename to source/game/graphics/unit_particle_type.h index 4d74a9794..2c2e82347 100644 --- a/source/glest_game/graphics/unit_particle_type.h +++ b/source/game/graphics/unit_particle_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/gui/display.cpp b/source/game/gui/display.cpp similarity index 97% rename from source/glest_game/gui/display.cpp rename to source/game/gui/display.cpp index d7be3da62..bb00da13f 100644 --- a/source/glest_game/gui/display.cpp +++ b/source/game/gui/display.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/gui/display.h b/source/game/gui/display.h similarity index 96% rename from source/glest_game/gui/display.h rename to source/game/gui/display.h index b61aa18bc..3b25edcc4 100644 --- a/source/glest_game/gui/display.h +++ b/source/game/gui/display.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/gui/gui.cpp b/source/game/gui/gui.cpp similarity index 99% rename from source/glest_game/gui/gui.cpp rename to source/game/gui/gui.cpp index 2a5aa65b6..0eaacbe20 100644 --- a/source/glest_game/gui/gui.cpp +++ b/source/game/gui/gui.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/gui/gui.h b/source/game/gui/gui.h similarity index 97% rename from source/glest_game/gui/gui.h rename to source/game/gui/gui.h index e76772732..67a524201 100644 --- a/source/glest_game/gui/gui.h +++ b/source/game/gui/gui.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/gui/selection.cpp b/source/game/gui/selection.cpp similarity index 98% rename from source/glest_game/gui/selection.cpp rename to source/game/gui/selection.cpp index 0b8107b96..62622fe5d 100644 --- a/source/glest_game/gui/selection.cpp +++ b/source/game/gui/selection.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/gui/selection.h b/source/game/gui/selection.h similarity index 94% rename from source/glest_game/gui/selection.h rename to source/game/gui/selection.h index 506cf28ec..475605ddd 100644 --- a/source/glest_game/gui/selection.h +++ b/source/game/gui/selection.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/main/battle_end.cpp b/source/game/main/battle_end.cpp similarity index 99% rename from source/glest_game/main/battle_end.cpp rename to source/game/main/battle_end.cpp index 89a94550d..d1ba5fac9 100644 --- a/source/glest_game/main/battle_end.cpp +++ b/source/game/main/battle_end.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -676,8 +676,8 @@ namespace Game { case ctCpuUltra: controlString = lang.getString("CpuUltra"); break; - case ctCpuZeta: - controlString = lang.getString("CpuZeta"); + case ctCpuGlest: + controlString = lang.getString("CpuGlest"); break; case ctNetwork: controlString = lang.getString("Network"); diff --git a/source/glest_game/main/battle_end.h b/source/game/main/battle_end.h similarity index 92% rename from source/glest_game/main/battle_end.h rename to source/game/main/battle_end.h index 3cf78596b..6b3d6f79c 100644 --- a/source/glest_game/main/battle_end.h +++ b/source/game/main/battle_end.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/main/intro.cpp b/source/game/main/intro.cpp similarity index 99% rename from source/glest_game/main/intro.cpp rename to source/game/main/intro.cpp index ac29446bd..0f0147ebe 100644 --- a/source/glest_game/main/intro.cpp +++ b/source/game/main/intro.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/main/intro.h b/source/game/main/intro.h similarity index 95% rename from source/glest_game/main/intro.h rename to source/game/main/intro.h index de7f03e91..77d13084a 100644 --- a/source/glest_game/main/intro.h +++ b/source/game/main/intro.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/main/main.cpp b/source/game/main/main.cpp similarity index 99% rename from source/glest_game/main/main.cpp rename to source/game/main/main.cpp index a1bf3911a..efc85d482 100644 --- a/source/glest_game/main/main.cpp +++ b/source/game/main/main.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -1127,7 +1127,7 @@ namespace Game { Config & config = Config::getInstance(); Metrics::reload(config.getInt("ScreenWidth"), config.getInt("ScreenHeight")); - //window->setText(config.getString("WindowTitle","ZetaGlest")); + //window->setText(config.getString("WindowTitle","Glest")); //this->mainMenu->init(); } @@ -7343,7 +7343,7 @@ namespace Game { gameSettings = &startupGameSettings; gameSettings->setMap(autoloadMapName); gameSettings->setTileset(tileset); - gameSettings->setTech("zetapack"); + gameSettings->setTech("factionpack"); gameSettings->setDefaultUnits(false); gameSettings->setDefaultResources(false); gameSettings->setDefaultVictoryConditions(true); diff --git a/source/glest_game/main/main.h b/source/game/main/main.h similarity index 94% rename from source/glest_game/main/main.h rename to source/game/main/main.h index e4a90afa0..810c798d5 100644 --- a/source/glest_game/main/main.h +++ b/source/game/main/main.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/main/program.cpp b/source/game/main/program.cpp similarity index 99% rename from source/glest_game/main/program.cpp rename to source/game/main/program.cpp index 50ae9f242..90e9a8e5c 100644 --- a/source/glest_game/main/program.cpp +++ b/source/game/main/program.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -56,7 +56,7 @@ namespace Game { bool Program::wantShutdownApplicationAfterGame = false; const char * - ProgramState::MAIN_PROGRAM_RENDER_KEY = "ZETAGLEST.RENDER"; + ProgramState::MAIN_PROGRAM_RENDER_KEY = "GLEST.RENDER"; // ===================================================== // class Program::CrashProgramState @@ -157,7 +157,7 @@ namespace Game { fprintf(stderr, "%s\n", msg); msgBox.setText(msg); } else { - msgBox.setText("ZetaGlest has crashed."); + msgBox.setText("Glest has crashed."); } mouse2dAnim = mouseY = mouseX = 0; @@ -1231,7 +1231,7 @@ namespace Game { __LINE__); //window - //window->setText("ZetaGlest"); + //window->setText("Glest"); window->setStyle(config.getBool("Windowed") ? wsWindowedFixed : wsFullscreen); window->setPos(0, 0); @@ -1316,7 +1316,7 @@ namespace Game { config.getBool("HardwareAcceleration", "true"), config.getBool("FullScreenAntiAliasing", "0"), config.getFloat("GammaValue", "0.0")); - window->setText(config.getString("WindowTitle", "ZetaGlest")); + window->setText(config.getString("WindowTitle", "Glest")); if (SystemFlags:: getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, @@ -1529,7 +1529,7 @@ namespace Game { // config.getBool("HardwareAcceleration","true"), // config.getBool("FullScreenAntiAliasing","false"), // config.getFloat("GammaValue","0.0")); - // window->setText(config.getString("WindowTitle","ZetaGlest")); + // window->setText(config.getString("WindowTitle","Glest")); // initResolution(); // } //} diff --git a/source/glest_game/main/program.h b/source/game/main/program.h similarity index 98% rename from source/glest_game/main/program.h rename to source/game/main/program.h index 75c19628d..c1dc1b891 100644 --- a/source/glest_game/main/program.h +++ b/source/game/main/program.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/ircclient.cpp b/source/game/menu/ircclient.cpp similarity index 98% rename from source/glest_game/menu/ircclient.cpp rename to source/game/menu/ircclient.cpp index 64fef9553..b3945a1a5 100644 --- a/source/glest_game/menu/ircclient.cpp +++ b/source/game/menu/ircclient.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -189,7 +189,7 @@ namespace Shared { * enabled * const char *announceJoin = { "has joined" }; - irc_cmd_msg(session, "#zetaglest-lobby", announceJoin); + irc_cmd_msg(session, "#glest-lobby", announceJoin); */ if (SystemFlags::VERBOSE_MODE_ENABLED || IRCThread::debugEnabled) printf("===> IRC: Line: %d\n", __LINE__); @@ -494,8 +494,8 @@ namespace Shared { get_nickname(tokens[j].c_str(), realNick, 127); if (SystemFlags::VERBOSE_MODE_ENABLED || IRCThread::debugEnabled) printf("===> IRC: LIBIRC_RFC_RPL_NAMREPLY user joined channel realNick [%s] tokens[j] [%s]\n", realNick, tokens[j].c_str()); - // Only show ZetaGlest users in the user list - //if(strncmp(&realNick[0],"ZG_",3) == 0) { + // Only show Glest users in the user list + //if(strncmp(&realNick[0],"G_",3) == 0) { nickList.push_back(realNick); //} } @@ -595,7 +595,7 @@ namespace Shared { MutexSafeWrapper safeMutex1(&mutexIRCSession, string(__FILE__) + "_" + intToStr(__LINE__)); if (ircSession != NULL) { - irc_cmd_quit(ircSession, "ZG Bot is closing!"); + irc_cmd_quit(ircSession, "Glest Bot is closing!"); } safeMutex1.ReleaseLock(); hasJoinedChannel = false; @@ -1054,7 +1054,7 @@ namespace Shared { if (connectRequired == false) { #if !defined(DISABLE_IRCCLIENT) MutexSafeWrapper safeMutex1(&mutexIRCSession, string(__FILE__) + "_" + intToStr(__LINE__)); - if (irc_connect(ircSession, argv[0].c_str(), IRC_SERVER_PORT, 0, this->nick.c_str(), this->username.c_str(), "zetaglest")) { + if (irc_connect(ircSession, argv[0].c_str(), IRC_SERVER_PORT, 0, this->nick.c_str(), this->username.c_str(), "glest")) { safeMutex1.ReleaseLock(); if (SystemFlags::VERBOSE_MODE_ENABLED || IRCThread::debugEnabled) printf("===> IRC Could not connect: %s\n", irc_strerror(irc_errno(ircSession))); diff --git a/source/glest_game/menu/ircclient.h b/source/game/menu/ircclient.h similarity index 96% rename from source/glest_game/menu/ircclient.h rename to source/game/menu/ircclient.h index 69b3e654d..70bbeb2f1 100644 --- a/source/glest_game/menu/ircclient.h +++ b/source/game/menu/ircclient.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/main_menu.cpp b/source/game/menu/main_menu.cpp similarity index 99% rename from source/glest_game/menu/main_menu.cpp rename to source/game/menu/main_menu.cpp index 72c62f609..3c80d34bc 100644 --- a/source/glest_game/menu/main_menu.cpp +++ b/source/game/menu/main_menu.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/main_menu.h b/source/game/menu/main_menu.h similarity index 96% rename from source/glest_game/menu/main_menu.h rename to source/game/menu/main_menu.h index c0a4cb30b..7e5ce54d5 100644 --- a/source/glest_game/menu/main_menu.h +++ b/source/game/menu/main_menu.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_background.cpp b/source/game/menu/menu_background.cpp similarity index 97% rename from source/glest_game/menu/menu_background.cpp rename to source/game/menu/menu_background.cpp index e9df15a91..6b8c094b8 100644 --- a/source/glest_game/menu/menu_background.cpp +++ b/source/game/menu/menu_background.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_background.h b/source/game/menu/menu_background.h similarity index 95% rename from source/glest_game/menu/menu_background.h rename to source/game/menu/menu_background.h index d64849a77..febf7b083 100644 --- a/source/glest_game/menu/menu_background.h +++ b/source/game/menu/menu_background.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_about.cpp b/source/game/menu/menu_state_about.cpp similarity index 98% rename from source/glest_game/menu/menu_state_about.cpp rename to source/game/menu/menu_state_about.cpp index c361084dc..c7510d8f2 100644 --- a/source/glest_game/menu/menu_state_about.cpp +++ b/source/game/menu/menu_state_about.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_about.h b/source/game/menu/menu_state_about.h similarity index 92% rename from source/glest_game/menu/menu_state_about.h rename to source/game/menu/menu_state_about.h index f32152c50..63470849a 100644 --- a/source/glest_game/menu/menu_state_about.h +++ b/source/game/menu/menu_state_about.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/game/menu/menu_state_connected_game.cpp similarity index 99% rename from source/glest_game/menu/menu_state_connected_game.cpp rename to source/game/menu/menu_state_connected_game.cpp index 3574064a4..5971ea47d 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/game/menu/menu_state_connected_game.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -58,7 +58,7 @@ namespace Game { const int HEADLESSSERVER_BROADCAST_SETTINGS_SECONDS = 2; static const char * - HEADLESS_SAVED_GAME_FILENAME = "lastHeadlessGameSettings.zgg"; + HEADLESS_SAVED_GAME_FILENAME = "lastHeadlessGameSettings.sav"; const int mapPreviewTexture_X = 5; @@ -372,7 +372,7 @@ namespace Game { listBoxMapFilter.setEditable(false); - // put them all in a set, to weed out duplicates (zgm, gbm & mgm with same name) + // put them all in a set, to weed out duplicates (gbm & mgm with same name) // will also ensure they are alphabetically listed (rather than how the OS provides them) listBoxMap.registerGraphicComponent(containerName, "listBoxMap"); listBoxMap.init(xoffset + 100, mapPos, 220); @@ -555,7 +555,7 @@ namespace Game { controlItems.push_back(lang.getString("CpuEasy")); controlItems.push_back(lang.getString("Cpu")); controlItems.push_back(lang.getString("CpuUltra")); - controlItems.push_back(lang.getString("CpuZeta")); + controlItems.push_back(lang.getString("CpuGlest")); controlItems.push_back(lang.getString("Network")); controlItems.push_back(lang.getString("Human")); @@ -600,7 +600,7 @@ namespace Game { //map listBox - // put them all in a set, to weed out duplicates (zgm, gbm & mgm with same name) + // put them all in a set, to weed out duplicates (gbm & mgm with same name) // will also ensure they are alphabetically listed (rather than how the OS provides them) setupMapList(""); listBoxMap.setItems(formattedPlayerSortedMaps[0]); @@ -953,7 +953,7 @@ namespace Game { controlItems.push_back(lang.getString("CpuEasy")); controlItems.push_back(lang.getString("Cpu")); controlItems.push_back(lang.getString("CpuUltra")); - controlItems.push_back(lang.getString("CpuZeta")); + controlItems.push_back(lang.getString("CpuGlest")); controlItems.push_back(lang.getString("Network")); controlItems.push_back(lang.getString("Human")); @@ -2402,10 +2402,10 @@ namespace Game { (GameConstants:: ultraMultiplier, 1)); listBoxRMultiplier[index].setEnabled(true); - } else if (ct == ctCpuZeta) { + } else if (ct == ctCpuGlest) { listBoxRMultiplier[index].setSelectedItem(floatToStr (GameConstants:: - zetaMultiplier, 1)); + glestMultiplier, 1)); listBoxRMultiplier[index].setEnabled(true); } else { listBoxRMultiplier[index].setSelectedItem(floatToStr @@ -2631,7 +2631,7 @@ namespace Game { || listBoxControls[i].getSelectedItemIndex() == ctCpuUltra || listBoxControls[i].getSelectedItemIndex() == - ctCpuZeta)) { + ctCpuGlest)) { if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n", extractFileFromDirectoryPath(__FILE__).c_str(), @@ -7997,7 +7997,7 @@ namespace Game { //printf("TECHS i = %d results [%s] scenario [%s]\n",i,results[i].c_str(),scenario.c_str()); results.at(i) = formatString(results.at(i)); - if (config.getString("InitialTechTree", "Zetapack") == + if (config.getString("InitialTechTree", "factionpack") == results.at(i)) { initialTechSelection = i; } diff --git a/source/glest_game/menu/menu_state_connected_game.h b/source/game/menu/menu_state_connected_game.h similarity index 98% rename from source/glest_game/menu/menu_state_connected_game.h rename to source/game/menu/menu_state_connected_game.h index a67f5c557..5184611c8 100644 --- a/source/glest_game/menu/menu_state_connected_game.h +++ b/source/game/menu/menu_state_connected_game.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/game/menu/menu_state_custom_game.cpp similarity index 99% rename from source/glest_game/menu/menu_state_custom_game.cpp rename to source/game/menu/menu_state_custom_game.cpp index 4ba039e92..ebe75dab2 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/game/menu/menu_state_custom_game.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -48,10 +48,10 @@ using namespace Shared; using namespace Shared::Util; namespace Game { - static const char *SAVED_GAME_FILENAME = "lastCustomGameSettings.zgg"; - static const char *DEFAULT_GAME_FILENAME = "data/defaultGameSetup.zgg"; + static const char *SAVED_GAME_FILENAME = "lastCustomGameSettings.sav"; + static const char *DEFAULT_GAME_FILENAME = "data/defaultGameSetup.sav"; static const char *DEFAULT_NETWORKGAME_FILENAME = - "data/defaultNetworkGameSetup.zgg"; + "data/defaultNetworkGameSetup.sav"; const int mapPreviewTexture_X = 5; const int mapPreviewTexture_Y = 160; @@ -123,7 +123,7 @@ namespace Game { } if (menu != NULL && faction == formatString(GameConstants::OBSERVER_SLOTNAME) - && (type == ctCpuEasy || type == ctCpu || type == ctCpuUltra || type == ctCpuZeta || type == ctNetwork)) { + && (type == ctCpuEasy || type == ctCpu || type == ctCpuUltra || type == ctCpuGlest || type == ctNetwork)) { if (selectedItemIndex == 0) selectedItemIndex = items.size() - 1; else @@ -167,7 +167,7 @@ namespace Game { } if (menu != NULL && faction == formatString(GameConstants::OBSERVER_SLOTNAME) - && (type == ctCpuEasy || type == ctCpu || type == ctCpuUltra || type == ctCpuZeta)) { + && (type == ctCpuEasy || type == ctCpu || type == ctCpuUltra || type == ctCpuGlest)) { selectedItemIndex = (selectedItemIndex + 1) % items.size(); } } @@ -301,7 +301,7 @@ namespace Game { serverInitError = false; try { networkManager.init(nrServer, openNetworkSlots); - } catch (const std::exception & e) { + } catch (const std::exception &) { try { networkManager.init(nrServer, openNetworkSlots); } catch (const std::exception & ex) { @@ -442,7 +442,7 @@ namespace Game { //map listBox listBoxMap.registerGraphicComponent(containerName, "listBoxMap"); listBoxMap.init(xoffset + 100, mapPos, 220); - // put them all in a set, to weed out duplicates (zgm, gbm, and mgm with same name) + // put them all in a set, to weed out duplicates (gbm, and mgm with same name) // will also ensure they are alphabetically listed (rather than how the OS provides them) int initialMapSelection = setupMapList(""); listBoxMap.setItems(formattedPlayerSortedMaps[0]); @@ -838,7 +838,7 @@ namespace Game { controlItems.push_back(lang.getString("CpuEasy")); controlItems.push_back(lang.getString("Cpu")); controlItems.push_back(lang.getString("CpuUltra")); - controlItems.push_back(lang.getString("CpuZeta")); + controlItems.push_back(lang.getString("CpuGlest")); controlItems.push_back(lang.getString("Network")); controlItems.push_back(lang.getString("Human")); @@ -932,7 +932,7 @@ namespace Game { listBoxControls[i].setSelectedItemIndex(ctNetwork); } } else { - listBoxControls[1].setSelectedItemIndex(ctCpuZeta); + listBoxControls[1].setSelectedItemIndex(ctCpuGlest); } updateControllers(); updateNetworkSlots(); @@ -1171,7 +1171,7 @@ namespace Game { controlItems.push_back(lang.getString("CpuEasy")); controlItems.push_back(lang.getString("Cpu")); controlItems.push_back(lang.getString("CpuUltra")); - controlItems.push_back(lang.getString("CpuZeta")); + controlItems.push_back(lang.getString("CpuGlest")); controlItems.push_back(lang.getString("Network")); controlItems.push_back(lang.getString("Human")); @@ -2257,7 +2257,7 @@ namespace Game { || listBoxControls[i].getSelectedItemIndex() == ctCpuUltra || listBoxControls[i].getSelectedItemIndex() == - ctCpuZeta)) { + ctCpuGlest)) { listBoxFactions[i].setSelectedItemIndex(0); } // @@ -4330,7 +4330,7 @@ namespace Game { || listBoxControls[i].getSelectedItemIndex() == ctCpuUltra || listBoxControls[i].getSelectedItemIndex() == - ctCpuZeta) && checkBoxScenario.getValue() == true) { + ctCpuGlest) && checkBoxScenario.getValue() == true) { } else { if (lastSelectedTeamIndex[i] >= 0 @@ -5839,7 +5839,7 @@ namespace Game { || listBoxControls[i].getSelectedItemIndex() == ctCpuUltra || listBoxControls[i].getSelectedItemIndex() == - ctCpuZeta)) { + ctCpuGlest)) { listBoxFactions[i].setSelectedItemIndex(0); } // @@ -5861,7 +5861,7 @@ namespace Game { || listBoxControls[i].getSelectedItemIndex() == ctCpuUltra || listBoxControls[i].getSelectedItemIndex() == - ctCpuZeta) { + ctCpuGlest) { lastSelectedTeamIndex[i] = listBoxTeams[i].getSelectedItemIndex(); } @@ -6123,7 +6123,7 @@ namespace Game { //printf("TECHS i = %d results [%s] scenario [%s]\n",i,results[i].c_str(),scenario.c_str()); results.at(i) = formatString(results.at(i)); - if (config.getString("InitialTechTree", "Zetapack") == + if (config.getString("InitialTechTree", "factionpack") == results.at(i)) { initialTechSelection = i; } diff --git a/source/glest_game/menu/menu_state_custom_game.h b/source/game/menu/menu_state_custom_game.h similarity index 98% rename from source/glest_game/menu/menu_state_custom_game.h rename to source/game/menu/menu_state_custom_game.h index 6863176ae..475a8a135 100644 --- a/source/glest_game/menu/menu_state_custom_game.h +++ b/source/game/menu/menu_state_custom_game.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_custom_game_update.cpp b/source/game/menu/menu_state_custom_game_update.cpp similarity index 99% rename from source/glest_game/menu/menu_state_custom_game_update.cpp rename to source/game/menu/menu_state_custom_game_update.cpp index 15b9b755d..f45ccdb40 100644 --- a/source/glest_game/menu/menu_state_custom_game_update.cpp +++ b/source/game/menu/menu_state_custom_game_update.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -917,7 +917,7 @@ namespace Game { || listBoxControls[i].getSelectedItemIndex() == ctCpuUltra || listBoxControls[i].getSelectedItemIndex() == - ctCpuZeta) { + ctCpuGlest) { setSlotHuman(i); foundNewSlotForHuman = true; @@ -1003,7 +1003,7 @@ namespace Game { } // Revert network to CPU - listBoxControls[i].setSelectedItemIndex(ctCpuZeta); + listBoxControls[i].setSelectedItemIndex(ctCpuGlest); } } slot = serverInterface->getSlot(i, true); @@ -1075,10 +1075,10 @@ namespace Game { ultraMultiplier, 1)); listBoxRMultiplier[index].setEnabled(checkBoxScenario.getValue() == false); - } else if (ct == ctCpuZeta) { + } else if (ct == ctCpuGlest) { listBoxRMultiplier[index].setSelectedItem(floatToStr (GameConstants:: - zetaMultiplier, 1)); + glestMultiplier, 1)); listBoxRMultiplier[index].setEnabled(checkBoxScenario.getValue() == false); } diff --git a/source/glest_game/menu/menu_state_graphic_info.cpp b/source/game/menu/menu_state_graphic_info.cpp similarity index 97% rename from source/glest_game/menu/menu_state_graphic_info.cpp rename to source/game/menu/menu_state_graphic_info.cpp index 9f5b5af8b..f5d8eab8b 100644 --- a/source/glest_game/menu/menu_state_graphic_info.cpp +++ b/source/game/menu/menu_state_graphic_info.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_graphic_info.h b/source/game/menu/menu_state_graphic_info.h similarity index 90% rename from source/glest_game/menu/menu_state_graphic_info.h rename to source/game/menu/menu_state_graphic_info.h index d54c28ec0..df931a081 100644 --- a/source/glest_game/menu/menu_state_graphic_info.h +++ b/source/game/menu/menu_state_graphic_info.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_join_game.cpp b/source/game/menu/menu_state_join_game.cpp similarity index 99% rename from source/glest_game/menu/menu_state_join_game.cpp rename to source/game/menu/menu_state_join_game.cpp index f6497b8fe..3795dab51 100644 --- a/source/glest_game/menu/menu_state_join_game.cpp +++ b/source/game/menu/menu_state_join_game.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_join_game.h b/source/game/menu/menu_state_join_game.h similarity index 94% rename from source/glest_game/menu/menu_state_join_game.h rename to source/game/menu/menu_state_join_game.h index d3612f4f8..e7964fa8d 100644 --- a/source/glest_game/menu/menu_state_join_game.h +++ b/source/game/menu/menu_state_join_game.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_keysetup.cpp b/source/game/menu/menu_state_keysetup.cpp similarity index 99% rename from source/glest_game/menu/menu_state_keysetup.cpp rename to source/game/menu/menu_state_keysetup.cpp index 9975257e8..429368959 100644 --- a/source/glest_game/menu/menu_state_keysetup.cpp +++ b/source/game/menu/menu_state_keysetup.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_keysetup.h b/source/game/menu/menu_state_keysetup.h similarity index 94% rename from source/glest_game/menu/menu_state_keysetup.h rename to source/game/menu/menu_state_keysetup.h index 5d0a6bcc7..2d72263e1 100644 --- a/source/glest_game/menu/menu_state_keysetup.h +++ b/source/game/menu/menu_state_keysetup.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_load_game.cpp b/source/game/menu/menu_state_load_game.cpp similarity index 98% rename from source/glest_game/menu/menu_state_load_game.cpp rename to source/game/menu/menu_state_load_game.cpp index 09a1dce1e..72b8b1714 100644 --- a/source/glest_game/menu/menu_state_load_game.cpp +++ b/source/game/menu/menu_state_load_game.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -380,8 +380,8 @@ namespace Game { const XmlNode *rootNode = xmlTree.getRootNode(); if (rootNode != NULL - && rootNode->hasChild("zetaglest-saved-game") == true) { - rootNode = rootNode->getChild("zetaglest-saved-game"); + && rootNode->hasChild("glest-saved-game") == true) { + rootNode = rootNode->getChild("glest-saved-game"); } if (rootNode == NULL) { diff --git a/source/glest_game/menu/menu_state_load_game.h b/source/game/menu/menu_state_load_game.h similarity index 93% rename from source/glest_game/menu/menu_state_load_game.h rename to source/game/menu/menu_state_load_game.h index d70d9c827..d344feb4a 100644 --- a/source/glest_game/menu/menu_state_load_game.h +++ b/source/game/menu/menu_state_load_game.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/game/menu/menu_state_masterserver.cpp similarity index 99% rename from source/glest_game/menu/menu_state_masterserver.cpp rename to source/game/menu/menu_state_masterserver.cpp index 843f2d900..59a97c5bf 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/game/menu/menu_state_masterserver.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ namespace Game { DisplayMessageFunction MenuStateMasterserver::pCB_DisplayMessage = NULL; static string IRC_SERVER = "irc.freenode.net"; - static string IRC_CHANNEL = "#zetaglest-lobby"; + static string IRC_CHANNEL = "#glest-lobby"; // ===================================================== // class MenuStateMasterserver @@ -307,7 +307,7 @@ namespace Game { Config::getInstance().getString("NetPlayerName", Socket::getHostName().c_str()); string ircname = netPlayerName.substr(0, 9); - snprintf(szIRCNick, 80, "ZG_%s_%d", ircname.c_str(), randomNickId); + snprintf(szIRCNick, 80, "G_%s_%d", ircname.c_str(), randomNickId); normalizeNick(szIRCNick); currentIrcNick = ircname; @@ -1173,13 +1173,13 @@ namespace Game { button->setFont3D(CoreData::getInstance(). getDisplayFontSmall3D()); - if (strncmp(&nickList[i][0], "ZG_", 3) == 0) { + if (strncmp(&nickList[i][0], "G_", 3) == 0) { button->setText(nickList[i].substr(3, nickList[i].length() - 7)); } else { button->setText(nickList[i]); } - if (strncmp(&nickList[i][0], "ZG_", 3) != 0 + if (strncmp(&nickList[i][0], "G_", 3) != 0 || &nickList[i][0] == currentIrcNick) { button->setEnabled(false); button->setEditable(false); diff --git a/source/glest_game/menu/menu_state_masterserver.h b/source/game/menu/menu_state_masterserver.h similarity index 96% rename from source/glest_game/menu/menu_state_masterserver.h rename to source/game/menu/menu_state_masterserver.h index 62a0616f7..3659e1c05 100644 --- a/source/glest_game/menu/menu_state_masterserver.h +++ b/source/game/menu/menu_state_masterserver.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/game/menu/menu_state_mods.cpp similarity index 99% rename from source/glest_game/menu/menu_state_mods.cpp rename to source/game/menu/menu_state_mods.cpp index cfcad3936..1cd7db142 100644 --- a/source/glest_game/menu/menu_state_mods.cpp +++ b/source/game/menu/menu_state_mods.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_mods.h b/source/game/menu/menu_state_mods.h similarity index 97% rename from source/glest_game/menu/menu_state_mods.h rename to source/game/menu/menu_state_mods.h index 7666b70b4..2cfe38c4d 100644 --- a/source/glest_game/menu/menu_state_mods.h +++ b/source/game/menu/menu_state_mods.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_new_game.cpp b/source/game/menu/menu_state_new_game.cpp similarity index 97% rename from source/glest_game/menu/menu_state_new_game.cpp rename to source/game/menu/menu_state_new_game.cpp index 91292a510..829b8cfdd 100644 --- a/source/glest_game/menu/menu_state_new_game.cpp +++ b/source/game/menu/menu_state_new_game.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_new_game.h b/source/game/menu/menu_state_new_game.h similarity index 89% rename from source/glest_game/menu/menu_state_new_game.h rename to source/game/menu/menu_state_new_game.h index 317ceb02a..344d238af 100644 --- a/source/glest_game/menu/menu_state_new_game.h +++ b/source/game/menu/menu_state_new_game.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/game/menu/menu_state_options.cpp similarity index 99% rename from source/glest_game/menu/menu_state_options.cpp rename to source/game/menu/menu_state_options.cpp index e67eb3545..ccb140128 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/game/menu/menu_state_options.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_options.h b/source/game/menu/menu_state_options.h similarity index 95% rename from source/glest_game/menu/menu_state_options.h rename to source/game/menu/menu_state_options.h index 89780b0ce..25f4eae50 100644 --- a/source/glest_game/menu/menu_state_options.h +++ b/source/game/menu/menu_state_options.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_options_graphics.cpp b/source/game/menu/menu_state_options_graphics.cpp similarity index 98% rename from source/glest_game/menu/menu_state_options_graphics.cpp rename to source/game/menu/menu_state_options_graphics.cpp index d08049912..1d391f341 100644 --- a/source/glest_game/menu/menu_state_options_graphics.cpp +++ b/source/game/menu/menu_state_options_graphics.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -406,8 +406,8 @@ namespace Game { listBoxAnimatedTilesetObjects.pushBackItem("100"); listBoxAnimatedTilesetObjects.pushBackItem("300"); listBoxAnimatedTilesetObjects.pushBackItem("500"); - listBoxAnimatedTilesetObjects.pushBackItem("∞"); - listBoxAnimatedTilesetObjects.setSelectedItem("∞", true); + listBoxAnimatedTilesetObjects.pushBackItem("???"); + listBoxAnimatedTilesetObjects.setSelectedItem("???", true); listBoxAnimatedTilesetObjects.setSelectedItem(config. getString ("AnimatedTilesetObjects", @@ -620,7 +620,7 @@ namespace Game { config.getFloat("GammaValue", "0.0")); Metrics::reload(this->program->getWindow()->getScreenWidth(), this->program->getWindow()->getScreenHeight()); - window->setText(config.getString("WindowTitle", "ZetaGlest")); + window->setText(config.getString("WindowTitle", "Glest")); this->mainMenu->init(); } @@ -1053,7 +1053,7 @@ namespace Game { config.setBool("MapPreview", checkBoxMapPreview.getValue()); config.setInt("MaxLights", listBoxLights.getSelectedItemIndex() + 1); - if (listBoxAnimatedTilesetObjects.getSelectedItem() == "∞") { + if (listBoxAnimatedTilesetObjects.getSelectedItem() == "???") { config.setInt("AnimatedTilesetObjects", -1); } else { config.setInt("AnimatedTilesetObjects", diff --git a/source/glest_game/menu/menu_state_options_graphics.h b/source/game/menu/menu_state_options_graphics.h similarity index 95% rename from source/glest_game/menu/menu_state_options_graphics.h rename to source/game/menu/menu_state_options_graphics.h index 3020bfc16..9c194e507 100644 --- a/source/glest_game/menu/menu_state_options_graphics.h +++ b/source/game/menu/menu_state_options_graphics.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_options_network.cpp b/source/game/menu/menu_state_options_network.cpp similarity index 99% rename from source/glest_game/menu/menu_state_options_network.cpp rename to source/game/menu/menu_state_options_network.cpp index 6068374db..1d6979301 100644 --- a/source/glest_game/menu/menu_state_options_network.cpp +++ b/source/game/menu/menu_state_options_network.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_options_network.h b/source/game/menu/menu_state_options_network.h similarity index 94% rename from source/glest_game/menu/menu_state_options_network.h rename to source/game/menu/menu_state_options_network.h index 186e59f70..cfa10dbcf 100644 --- a/source/glest_game/menu/menu_state_options_network.h +++ b/source/game/menu/menu_state_options_network.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_options_sound.cpp b/source/game/menu/menu_state_options_sound.cpp similarity index 98% rename from source/glest_game/menu/menu_state_options_sound.cpp rename to source/game/menu/menu_state_options_sound.cpp index 77e754e00..b118ee9cc 100644 --- a/source/glest_game/menu/menu_state_options_sound.cpp +++ b/source/game/menu/menu_state_options_sound.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_options_sound.h b/source/game/menu/menu_state_options_sound.h similarity index 93% rename from source/glest_game/menu/menu_state_options_sound.h rename to source/game/menu/menu_state_options_sound.h index b9bdb6ad5..c7af8895d 100644 --- a/source/glest_game/menu/menu_state_options_sound.h +++ b/source/game/menu/menu_state_options_sound.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_root.cpp b/source/game/menu/menu_state_root.cpp similarity index 99% rename from source/glest_game/menu/menu_state_root.cpp rename to source/game/menu/menu_state_root.cpp index 67c7ea6a4..f60c6afe4 100644 --- a/source/glest_game/menu/menu_state_root.cpp +++ b/source/game/menu/menu_state_root.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -864,7 +864,7 @@ namespace Game { || ftpFileURL == "") { char szMsg[8096] = ""; snprintf(szMsg, 8096, - "A new update was detected: %s\nUpdate Date: %s\nPlease visit zetaglest.github.io for details!", + "A new update was detected: %s\nUpdate Date: %s\nPlease visit glest.github.io for details!", props.getString("LatestGameVersion", "?").c_str(), props.getString("LatestGameVersionReleaseDate", "?").c_str()); diff --git a/source/glest_game/menu/menu_state_root.h b/source/game/menu/menu_state_root.h similarity index 94% rename from source/glest_game/menu/menu_state_root.h rename to source/game/menu/menu_state_root.h index 2427a275b..8979a2a15 100644 --- a/source/glest_game/menu/menu_state_root.h +++ b/source/game/menu/menu_state_root.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_scenario.cpp b/source/game/menu/menu_state_scenario.cpp similarity index 99% rename from source/glest_game/menu/menu_state_scenario.cpp rename to source/game/menu/menu_state_scenario.cpp index 9df7a3797..8742463a6 100644 --- a/source/glest_game/menu/menu_state_scenario.cpp +++ b/source/game/menu/menu_state_scenario.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/menu_state_scenario.h b/source/game/menu/menu_state_scenario.h similarity index 93% rename from source/glest_game/menu/menu_state_scenario.h rename to source/game/menu/menu_state_scenario.h index e80f95f2c..78a34b47e 100644 --- a/source/glest_game/menu/menu_state_scenario.h +++ b/source/game/menu/menu_state_scenario.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/server_line.cpp b/source/game/menu/server_line.cpp similarity index 98% rename from source/glest_game/menu/server_line.cpp rename to source/game/menu/server_line.cpp index 449158bb2..cac4e29f1 100644 --- a/source/glest_game/menu/server_line.cpp +++ b/source/game/menu/server_line.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/menu/server_line.h b/source/game/menu/server_line.h similarity index 92% rename from source/glest_game/menu/server_line.h rename to source/game/menu/server_line.h index fa8a9710a..f5be80d26 100644 --- a/source/glest_game/menu/server_line.h +++ b/source/game/menu/server_line.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/client_interface.cpp b/source/game/network/client_interface.cpp similarity index 99% rename from source/glest_game/network/client_interface.cpp rename to source/game/network/client_interface.cpp index e4a44b881..d338cc276 100644 --- a/source/glest_game/network/client_interface.cpp +++ b/source/game/network/client_interface.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/client_interface.h b/source/game/network/client_interface.h similarity index 97% rename from source/glest_game/network/client_interface.h rename to source/game/network/client_interface.h index 6d68b81c4..8e4cc6e74 100644 --- a/source/glest_game/network/client_interface.h +++ b/source/game/network/client_interface.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/connection_slot.cpp b/source/game/network/connection_slot.cpp similarity index 99% rename from source/glest_game/network/connection_slot.cpp rename to source/game/network/connection_slot.cpp index 415ba04f2..77e9e8bcd 100644 --- a/source/glest_game/network/connection_slot.cpp +++ b/source/game/network/connection_slot.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/connection_slot.h b/source/game/network/connection_slot.h similarity index 98% rename from source/glest_game/network/connection_slot.h rename to source/game/network/connection_slot.h index bffecf425..9ae5e6b01 100644 --- a/source/glest_game/network/connection_slot.h +++ b/source/game/network/connection_slot.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/masterserver_info.h b/source/game/network/masterserver_info.h similarity index 95% rename from source/glest_game/network/masterserver_info.h rename to source/game/network/masterserver_info.h index 970196c4f..be609f889 100644 --- a/source/glest_game/network/masterserver_info.h +++ b/source/game/network/masterserver_info.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_interface.cpp b/source/game/network/network_interface.cpp similarity index 99% rename from source/glest_game/network/network_interface.cpp rename to source/game/network/network_interface.cpp index 31d14037a..6381df6b6 100644 --- a/source/glest_game/network/network_interface.cpp +++ b/source/game/network/network_interface.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_interface.h b/source/game/network/network_interface.h similarity index 98% rename from source/glest_game/network/network_interface.h rename to source/game/network/network_interface.h index f6916ed68..07f1049e1 100644 --- a/source/glest_game/network/network_interface.h +++ b/source/game/network/network_interface.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_manager.cpp b/source/game/network/network_manager.cpp similarity index 97% rename from source/glest_game/network/network_manager.cpp rename to source/game/network/network_manager.cpp index 0288647d1..49ec4b116 100644 --- a/source/glest_game/network/network_manager.cpp +++ b/source/game/network/network_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_manager.h b/source/game/network/network_manager.h similarity index 91% rename from source/glest_game/network/network_manager.h rename to source/game/network/network_manager.h index 25a6eafc0..d546c0853 100644 --- a/source/glest_game/network/network_manager.h +++ b/source/game/network/network_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_message.cpp b/source/game/network/network_message.cpp similarity index 99% rename from source/glest_game/network/network_message.cpp rename to source/game/network/network_message.cpp index d82e6af1e..fab6a9dd7 100644 --- a/source/glest_game/network/network_message.cpp +++ b/source/game/network/network_message.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_message.h b/source/game/network/network_message.h similarity index 99% rename from source/glest_game/network/network_message.h rename to source/game/network/network_message.h index 49a2b0088..15c42260e 100644 --- a/source/glest_game/network/network_message.h +++ b/source/game/network/network_message.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_protocol.cpp b/source/game/network/network_protocol.cpp similarity index 98% rename from source/glest_game/network/network_protocol.cpp rename to source/game/network/network_protocol.cpp index 1fa136aa3..320e7d759 100644 --- a/source/glest_game/network/network_protocol.cpp +++ b/source/game/network/network_protocol.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_protocol.h b/source/game/network/network_protocol.h similarity index 84% rename from source/glest_game/network/network_protocol.h rename to source/game/network/network_protocol.h index b5824ae04..7d9c0d2f2 100644 --- a/source/glest_game/network/network_protocol.h +++ b/source/game/network/network_protocol.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_types.cpp b/source/game/network/network_types.cpp similarity index 98% rename from source/glest_game/network/network_types.cpp rename to source/game/network/network_types.cpp index 0d5df97e9..8faf9e7e8 100644 --- a/source/glest_game/network/network_types.cpp +++ b/source/game/network/network_types.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/network_types.h b/source/game/network/network_types.h similarity index 96% rename from source/glest_game/network/network_types.h rename to source/game/network/network_types.h index b7c438afd..a10528392 100644 --- a/source/glest_game/network/network_types.h +++ b/source/game/network/network_types.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/server_interface.cpp b/source/game/network/server_interface.cpp similarity index 99% rename from source/glest_game/network/server_interface.cpp rename to source/game/network/server_interface.cpp index ba8c7b6ad..955b8fdd8 100644 --- a/source/glest_game/network/server_interface.cpp +++ b/source/game/network/server_interface.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/network/server_interface.h b/source/game/network/server_interface.h similarity index 98% rename from source/glest_game/network/server_interface.h rename to source/game/network/server_interface.h index 32ae50f93..7c1277248 100644 --- a/source/glest_game/network/server_interface.h +++ b/source/game/network/server_interface.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/sound/sound_container.cpp b/source/game/sound/sound_container.cpp similarity index 89% rename from source/glest_game/sound/sound_container.cpp rename to source/game/sound/sound_container.cpp index 8c0e23b20..7861180fc 100644 --- a/source/glest_game/sound/sound_container.cpp +++ b/source/game/sound/sound_container.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/sound/sound_container.h b/source/game/sound/sound_container.h similarity index 91% rename from source/glest_game/sound/sound_container.h rename to source/game/sound/sound_container.h index 76724de28..6e9fdf18e 100644 --- a/source/glest_game/sound/sound_container.h +++ b/source/game/sound/sound_container.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/sound/sound_renderer.cpp b/source/game/sound/sound_renderer.cpp similarity index 98% rename from source/glest_game/sound/sound_renderer.cpp rename to source/game/sound/sound_renderer.cpp index f13824f90..be67ae250 100644 --- a/source/glest_game/sound/sound_renderer.cpp +++ b/source/game/sound/sound_renderer.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/sound/sound_renderer.h b/source/game/sound/sound_renderer.h similarity index 93% rename from source/glest_game/sound/sound_renderer.h rename to source/game/sound/sound_renderer.h index 6372a9b72..b3ed56c97 100644 --- a/source/glest_game/sound/sound_renderer.h +++ b/source/game/sound/sound_renderer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/steam/steam.cpp b/source/game/steam/steam.cpp similarity index 98% rename from source/glest_game/steam/steam.cpp rename to source/game/steam/steam.cpp index d9fa9da77..5d274ed98 100644 --- a/source/glest_game/steam/steam.cpp +++ b/source/game/steam/steam.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/steam/steam.h b/source/game/steam/steam.h similarity index 95% rename from source/glest_game/steam/steam.h rename to source/game/steam/steam.h index cfc7cfc8d..12dacacd9 100644 --- a/source/glest_game/steam/steam.h +++ b/source/game/steam/steam.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/steamshim/steamshim_child.c b/source/game/steamshim/steamshim_child.c similarity index 98% rename from source/glest_game/steamshim/steamshim_child.c rename to source/game/steamshim/steamshim_child.c index 4b1b3f0db..84930b4a4 100644 --- a/source/glest_game/steamshim/steamshim_child.c +++ b/source/game/steamshim/steamshim_child.c @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/steamshim/steamshim_child.h b/source/game/steamshim/steamshim_child.h similarity index 92% rename from source/glest_game/steamshim/steamshim_child.h rename to source/game/steamshim/steamshim_child.h index 2d2a67e1a..65888d316 100644 --- a/source/glest_game/steamshim/steamshim_child.h +++ b/source/game/steamshim/steamshim_child.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/command.cpp b/source/game/type_instances/command.cpp similarity index 98% rename from source/glest_game/type_instances/command.cpp rename to source/game/type_instances/command.cpp index f749e6652..980f2729f 100644 --- a/source/glest_game/type_instances/command.cpp +++ b/source/game/type_instances/command.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/command.h b/source/game/type_instances/command.h similarity index 95% rename from source/glest_game/type_instances/command.h rename to source/game/type_instances/command.h index 324d3b185..516ff836a 100644 --- a/source/glest_game/type_instances/command.h +++ b/source/game/type_instances/command.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/faction.cpp b/source/game/type_instances/faction.cpp similarity index 99% rename from source/glest_game/type_instances/faction.cpp rename to source/game/type_instances/faction.cpp index 1396e3746..faf9efdbd 100644 --- a/source/glest_game/type_instances/faction.cpp +++ b/source/game/type_instances/faction.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -821,7 +821,7 @@ namespace Game { bool Faction::canUnitsPathfind() { bool result = true; if (control == ctCpuEasy || control == ctCpu || - control == ctCpuUltra || control == ctCpuZeta) { + control == ctCpuUltra || control == ctCpuGlest) { //printf("AI player for faction index: %d (%s) current pathfinding: %d\n",index,factionType->getName().c_str(),getUnitPathfindingListCount()); const int MAX_UNITS_PATHFINDING_PER_FRAME = 10; @@ -1044,7 +1044,7 @@ namespace Game { bool Faction::getCpuControl() const { return control == ctCpuEasy || control == ctCpu || control == ctCpuUltra - || control == ctCpuZeta; + || control == ctCpuGlest; } // ==================== upgrade manager ==================== diff --git a/source/glest_game/type_instances/faction.h b/source/game/type_instances/faction.h similarity index 98% rename from source/glest_game/type_instances/faction.h rename to source/game/type_instances/faction.h index 5ef2856a8..3f28fa812 100644 --- a/source/glest_game/type_instances/faction.h +++ b/source/game/type_instances/faction.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -339,8 +339,8 @@ namespace Game { inline bool getCpuUltraControl() const { return control == ctCpuUltra; } - inline bool getCpuZetaControl() const { - return control == ctCpuZeta; + inline bool getCpuGlestControl() const { + return control == ctCpuGlest; } inline ControlType getControlType() const { return control; diff --git a/source/glest_game/type_instances/object.cpp b/source/game/type_instances/object.cpp similarity index 98% rename from source/glest_game/type_instances/object.cpp rename to source/game/type_instances/object.cpp index ee0b83fd4..4a2036a1f 100644 --- a/source/glest_game/type_instances/object.cpp +++ b/source/game/type_instances/object.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/object.h b/source/game/type_instances/object.h similarity index 95% rename from source/glest_game/type_instances/object.h rename to source/game/type_instances/object.h index 0da665515..edfb0216b 100644 --- a/source/glest_game/type_instances/object.h +++ b/source/game/type_instances/object.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/resource.cpp b/source/game/type_instances/resource.cpp similarity index 96% rename from source/glest_game/type_instances/resource.cpp rename to source/game/type_instances/resource.cpp index 76c71a2a9..012b92f52 100644 --- a/source/glest_game/type_instances/resource.cpp +++ b/source/game/type_instances/resource.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/resource.h b/source/game/type_instances/resource.h similarity index 92% rename from source/glest_game/type_instances/resource.h rename to source/game/type_instances/resource.h index 956244e84..d689ab1dc 100644 --- a/source/glest_game/type_instances/resource.h +++ b/source/game/type_instances/resource.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/unit.cpp b/source/game/type_instances/unit.cpp similarity index 99% rename from source/glest_game/type_instances/unit.cpp rename to source/game/type_instances/unit.cpp index abc09fca8..c4b1740e3 100644 --- a/source/glest_game/type_instances/unit.cpp +++ b/source/game/type_instances/unit.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/unit.h b/source/game/type_instances/unit.h similarity index 99% rename from source/glest_game/type_instances/unit.h rename to source/game/type_instances/unit.h index 4133af5cf..fbf6f24e5 100644 --- a/source/glest_game/type_instances/unit.h +++ b/source/game/type_instances/unit.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/upgrade.cpp b/source/game/type_instances/upgrade.cpp similarity index 98% rename from source/glest_game/type_instances/upgrade.cpp rename to source/game/type_instances/upgrade.cpp index 39c8d05e2..6a5c48949 100644 --- a/source/glest_game/type_instances/upgrade.cpp +++ b/source/game/type_instances/upgrade.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/type_instances/upgrade.h b/source/game/type_instances/upgrade.h similarity index 97% rename from source/glest_game/type_instances/upgrade.h rename to source/game/type_instances/upgrade.h index d5b79dc04..7c59aa6e8 100644 --- a/source/glest_game/type_instances/upgrade.h +++ b/source/game/type_instances/upgrade.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/command_type.cpp b/source/game/types/command_type.cpp similarity index 99% rename from source/glest_game/types/command_type.cpp rename to source/game/types/command_type.cpp index 7a350e42d..754c61547 100644 --- a/source/glest_game/types/command_type.cpp +++ b/source/game/types/command_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/command_type.h b/source/game/types/command_type.h similarity index 99% rename from source/glest_game/types/command_type.h rename to source/game/types/command_type.h index d3a23b92f..128829ee5 100644 --- a/source/glest_game/types/command_type.h +++ b/source/game/types/command_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/damage_multiplier.cpp b/source/game/types/damage_multiplier.cpp similarity index 95% rename from source/glest_game/types/damage_multiplier.cpp rename to source/game/types/damage_multiplier.cpp index b207407ad..983b7b56d 100644 --- a/source/glest_game/types/damage_multiplier.cpp +++ b/source/game/types/damage_multiplier.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/damage_multiplier.h b/source/game/types/damage_multiplier.h similarity index 93% rename from source/glest_game/types/damage_multiplier.h rename to source/game/types/damage_multiplier.h index f5b3a6358..1bef28a73 100644 --- a/source/glest_game/types/damage_multiplier.h +++ b/source/game/types/damage_multiplier.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/element_type.cpp b/source/game/types/element_type.cpp similarity index 97% rename from source/glest_game/types/element_type.cpp rename to source/game/types/element_type.cpp index f8177c6ee..3c59e14cf 100644 --- a/source/glest_game/types/element_type.cpp +++ b/source/game/types/element_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/element_type.h b/source/game/types/element_type.h similarity index 95% rename from source/glest_game/types/element_type.h rename to source/game/types/element_type.h index 16e434770..e57a908f6 100644 --- a/source/glest_game/types/element_type.h +++ b/source/game/types/element_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/faction_type.cpp b/source/game/types/faction_type.cpp similarity index 99% rename from source/glest_game/types/faction_type.cpp rename to source/game/types/faction_type.cpp index 7c1615180..d411db961 100644 --- a/source/glest_game/types/faction_type.cpp +++ b/source/game/types/faction_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/faction_type.h b/source/game/types/faction_type.h similarity index 95% rename from source/glest_game/types/faction_type.h rename to source/game/types/faction_type.h index a907e991b..ec62e54ba 100644 --- a/source/glest_game/types/faction_type.h +++ b/source/game/types/faction_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -54,7 +54,7 @@ namespace Game { aibsvcMaxBuildRadius, aibsvcMinMinWarriors, aibsvcMinMinWarriorsExpandCpuEasy, - aibsvcMinMinWarriorsExpandCpuZeta, + aibsvcMinMinWarriorsExpandCpuGlest, aibsvcMinMinWarriorsExpandCpuUltra, aibsvcMinMinWarriorsExpandCpuNormal, aibsvcMaxMinWarriors, @@ -72,9 +72,9 @@ namespace Game { enumMap["MinMinWarriorsExpandCpuEasy"] = aibsvcMinMinWarriorsExpandCpuEasy; enumMap["MinMinWarriorsExpandCpuMega"] = - aibsvcMinMinWarriorsExpandCpuZeta; - enumMap["MinMinWarriorsExpandCpuZeta"] = - aibsvcMinMinWarriorsExpandCpuZeta; + aibsvcMinMinWarriorsExpandCpuGlest; + enumMap["MinMinWarriorsExpandCpuGlest"] = + aibsvcMinMinWarriorsExpandCpuGlest; enumMap["MinMinWarriorsExpandCpuUltra"] = aibsvcMinMinWarriorsExpandCpuUltra; enumMap["MinMinWarriorsExpandCpuNormal"] = diff --git a/source/glest_game/types/object_type.cpp b/source/game/types/object_type.cpp similarity index 92% rename from source/glest_game/types/object_type.cpp rename to source/game/types/object_type.cpp index 958f14f7a..7f788871c 100644 --- a/source/glest_game/types/object_type.cpp +++ b/source/game/types/object_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/object_type.h b/source/game/types/object_type.h similarity index 93% rename from source/glest_game/types/object_type.h rename to source/game/types/object_type.h index 5629be1e2..0c421390b 100644 --- a/source/glest_game/types/object_type.h +++ b/source/game/types/object_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/projectile_type.cpp b/source/game/types/projectile_type.cpp similarity index 96% rename from source/glest_game/types/projectile_type.cpp rename to source/game/types/projectile_type.cpp index ee7533330..12805c049 100644 --- a/source/glest_game/types/projectile_type.cpp +++ b/source/game/types/projectile_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/projectile_type.h b/source/game/types/projectile_type.h similarity index 95% rename from source/glest_game/types/projectile_type.h rename to source/game/types/projectile_type.h index 6815775f2..0ab3d2923 100644 --- a/source/glest_game/types/projectile_type.h +++ b/source/game/types/projectile_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/resource_type.cpp b/source/game/types/resource_type.cpp similarity index 98% rename from source/glest_game/types/resource_type.cpp rename to source/game/types/resource_type.cpp index c9fe729f0..328282b6f 100644 --- a/source/glest_game/types/resource_type.cpp +++ b/source/game/types/resource_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/resource_type.h b/source/game/types/resource_type.h similarity index 94% rename from source/glest_game/types/resource_type.h rename to source/game/types/resource_type.h index 4dd8339f9..f555fe838 100644 --- a/source/glest_game/types/resource_type.h +++ b/source/game/types/resource_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/skill_type.cpp b/source/game/types/skill_type.cpp similarity index 99% rename from source/glest_game/types/skill_type.cpp rename to source/game/types/skill_type.cpp index 337e73422..4db2c1aad 100644 --- a/source/glest_game/types/skill_type.cpp +++ b/source/game/types/skill_type.cpp @@ -1,8 +1,8 @@ -// =// This file is part of ZetaGlest +// =// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/skill_type.h b/source/game/types/skill_type.h similarity index 99% rename from source/glest_game/types/skill_type.h rename to source/game/types/skill_type.h index 915b84752..a37e17ea2 100644 --- a/source/glest_game/types/skill_type.h +++ b/source/game/types/skill_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/tech_tree.cpp b/source/game/types/tech_tree.cpp similarity index 99% rename from source/glest_game/types/tech_tree.cpp rename to source/game/types/tech_tree.cpp index 8c2dad212..9df8605b9 100644 --- a/source/glest_game/types/tech_tree.cpp +++ b/source/game/types/tech_tree.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/tech_tree.h b/source/game/types/tech_tree.h similarity index 96% rename from source/glest_game/types/tech_tree.h rename to source/game/types/tech_tree.h index a7b4882a0..2a1feca9a 100644 --- a/source/glest_game/types/tech_tree.h +++ b/source/game/types/tech_tree.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/tileset_model_type.cpp b/source/game/types/tileset_model_type.cpp similarity index 89% rename from source/glest_game/types/tileset_model_type.cpp rename to source/game/types/tileset_model_type.cpp index 0624a61c5..0e4e1d33e 100644 --- a/source/glest_game/types/tileset_model_type.cpp +++ b/source/game/types/tileset_model_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/tileset_model_type.h b/source/game/types/tileset_model_type.h similarity index 94% rename from source/glest_game/types/tileset_model_type.h rename to source/game/types/tileset_model_type.h index 59d0bf6ef..edeaa8f30 100644 --- a/source/glest_game/types/tileset_model_type.h +++ b/source/game/types/tileset_model_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/unit_type.cpp b/source/game/types/unit_type.cpp similarity index 99% rename from source/glest_game/types/unit_type.cpp rename to source/game/types/unit_type.cpp index ee646d260..bc8c55b2e 100644 --- a/source/glest_game/types/unit_type.cpp +++ b/source/game/types/unit_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/unit_type.h b/source/game/types/unit_type.h similarity index 98% rename from source/glest_game/types/unit_type.h rename to source/game/types/unit_type.h index 58422ac22..7a3642a7a 100644 --- a/source/glest_game/types/unit_type.h +++ b/source/game/types/unit_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/upgrade_type.cpp b/source/game/types/upgrade_type.cpp similarity index 99% rename from source/glest_game/types/upgrade_type.cpp rename to source/game/types/upgrade_type.cpp index cd30513e5..d3b44a174 100644 --- a/source/glest_game/types/upgrade_type.cpp +++ b/source/game/types/upgrade_type.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/types/upgrade_type.h b/source/game/types/upgrade_type.h similarity index 99% rename from source/glest_game/types/upgrade_type.h rename to source/game/types/upgrade_type.h index 1741e50fc..d6ca9109f 100644 --- a/source/glest_game/types/upgrade_type.h +++ b/source/game/types/upgrade_type.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/map.cpp b/source/game/world/map.cpp similarity index 99% rename from source/glest_game/world/map.cpp rename to source/game/world/map.cpp index e6cce2848..80486a00a 100644 --- a/source/glest_game/world/map.cpp +++ b/source/game/world/map.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/map.h b/source/game/world/map.h similarity index 99% rename from source/glest_game/world/map.h rename to source/game/world/map.h index 6e412441c..a86675996 100644 --- a/source/glest_game/world/map.h +++ b/source/game/world/map.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/minimap.cpp b/source/game/world/minimap.cpp similarity index 98% rename from source/glest_game/world/minimap.cpp rename to source/game/world/minimap.cpp index 2b50059ce..6bb15657b 100644 --- a/source/glest_game/world/minimap.cpp +++ b/source/game/world/minimap.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/minimap.h b/source/game/world/minimap.h similarity index 93% rename from source/glest_game/world/minimap.h rename to source/game/world/minimap.h index 0ee5e7eed..b336bb5ca 100644 --- a/source/glest_game/world/minimap.h +++ b/source/game/world/minimap.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/scenario.cpp b/source/game/world/scenario.cpp similarity index 98% rename from source/glest_game/world/scenario.cpp rename to source/game/world/scenario.cpp index e3382782f..6260d0cdd 100644 --- a/source/glest_game/world/scenario.cpp +++ b/source/game/world/scenario.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -237,7 +237,7 @@ namespace Game { // on how to obtain a scenario // -andy5995 2018-02-01 scenarioInfo->desc = "This scenario will be available soon.\n\n\ -Please contact the ZetaGlest team for more info."; +Please contact the Glest team for more info."; scenarioInfo->name = file; return false; @@ -330,9 +330,9 @@ Please contact the ZetaGlest team for more info."; if (factionControl == ctCpuUltra) { scenarioInfo->resourceMultipliers[i] = GameConstants::ultraMultiplier; - } else if (factionControl == ctCpuZeta) { + } else if (factionControl == ctCpuGlest) { scenarioInfo->resourceMultipliers[i] = - GameConstants::zetaMultiplier; + GameConstants::glestMultiplier; } } @@ -535,8 +535,8 @@ Please contact the ZetaGlest team for more info."; return ctCpu; } else if (str == "cpu-ultra") { return ctCpuUltra; - } else if (str == "cpu-mega" || str == "cpu-zeta") { - return ctCpuZeta; + } else if (str == "cpu-mega" || str == "cpu-glest") { + return ctCpuGlest; } else if (str == "human") { return ctHuman; } else if (str == "network") { @@ -564,8 +564,8 @@ Please contact the ZetaGlest team for more info."; case ctCpuUltra: controlString = lang.getString("CpuUltra"); break; - case ctCpuZeta: - controlString = lang.getString("CpuZeta"); + case ctCpuGlest: + controlString = lang.getString("CpuGlest"); break; case ctNetwork: controlString = lang.getString("Network"); diff --git a/source/glest_game/world/scenario.h b/source/game/world/scenario.h similarity index 96% rename from source/glest_game/world/scenario.h rename to source/game/world/scenario.h index 55e2aac87..b22570ce4 100644 --- a/source/glest_game/world/scenario.h +++ b/source/game/world/scenario.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/surface_atlas.cpp b/source/game/world/surface_atlas.cpp similarity index 95% rename from source/glest_game/world/surface_atlas.cpp rename to source/game/world/surface_atlas.cpp index 5f02c3f16..efdd12e74 100644 --- a/source/glest_game/world/surface_atlas.cpp +++ b/source/game/world/surface_atlas.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/surface_atlas.h b/source/game/world/surface_atlas.h similarity index 94% rename from source/glest_game/world/surface_atlas.h rename to source/game/world/surface_atlas.h index 83fdfac9c..c82b7405d 100644 --- a/source/glest_game/world/surface_atlas.h +++ b/source/game/world/surface_atlas.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/tileset.cpp b/source/game/world/tileset.cpp similarity index 99% rename from source/glest_game/world/tileset.cpp rename to source/game/world/tileset.cpp index 7043ae5a4..58485a11a 100644 --- a/source/glest_game/world/tileset.cpp +++ b/source/game/world/tileset.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/tileset.h b/source/game/world/tileset.h similarity index 97% rename from source/glest_game/world/tileset.h rename to source/game/world/tileset.h index 1c44e6498..029b79f35 100644 --- a/source/glest_game/world/tileset.h +++ b/source/game/world/tileset.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/time_flow.cpp b/source/game/world/time_flow.cpp similarity index 97% rename from source/glest_game/world/time_flow.cpp rename to source/game/world/time_flow.cpp index e264b5cae..d65bb5a6e 100644 --- a/source/glest_game/world/time_flow.cpp +++ b/source/game/world/time_flow.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/time_flow.h b/source/game/world/time_flow.h similarity index 91% rename from source/glest_game/world/time_flow.h rename to source/game/world/time_flow.h index 69525a9d5..242de164e 100644 --- a/source/glest_game/world/time_flow.h +++ b/source/game/world/time_flow.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/unit_updater.cpp b/source/game/world/unit_updater.cpp similarity index 99% rename from source/glest_game/world/unit_updater.cpp rename to source/game/world/unit_updater.cpp index 3565dc59d..a1948ab41 100644 --- a/source/glest_game/world/unit_updater.cpp +++ b/source/game/world/unit_updater.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -2928,7 +2928,7 @@ namespace Game { Unit* attackingEnemySeen = NULL; ControlType controlType = unit->getFaction()->getControlType(); bool isUltra = controlType == ctCpuUltra; - bool isZeta = controlType == ctCpuZeta; + bool isGlest = controlType == ctCpuGlest; string randomInfoData = "enemies.size() = " + intToStr(enemies.size()); @@ -2964,7 +2964,7 @@ namespace Game { result = true; } - if (isUltra || isZeta) { + if (isUltra || isGlest) { if (distToStandingUnit < 0 || currentDist < distToStandingUnit) { if (enemies[i]->getCurrSkill() != NULL && enemies[i]->getCurrSkill()->getClass() == scAttack) { @@ -2977,7 +2977,7 @@ namespace Game { } } - if (evalMode == false && (isUltra || isZeta)) { + if (evalMode == false && (isUltra || isGlest)) { unit->getRandom()->addLastCaller(randomInfoData); diff --git a/source/glest_game/world/unit_updater.h b/source/game/world/unit_updater.h similarity index 97% rename from source/glest_game/world/unit_updater.h rename to source/game/world/unit_updater.h index 4aacae630..3fa04445e 100644 --- a/source/glest_game/world/unit_updater.h +++ b/source/game/world/unit_updater.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/water_effects.cpp b/source/game/world/water_effects.cpp similarity index 91% rename from source/glest_game/world/water_effects.cpp rename to source/game/world/water_effects.cpp index 15f39f224..02b0f5946 100644 --- a/source/glest_game/world/water_effects.cpp +++ b/source/game/world/water_effects.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/water_effects.h b/source/game/world/water_effects.h similarity index 92% rename from source/glest_game/world/water_effects.h rename to source/game/world/water_effects.h index 9434b0e7a..1e8073348 100644 --- a/source/glest_game/world/water_effects.h +++ b/source/game/world/water_effects.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_game/world/world.cpp b/source/game/world/world.cpp similarity index 99% rename from source/glest_game/world/world.cpp rename to source/game/world/world.cpp index 8aec075de..7691d7e4a 100644 --- a/source/glest_game/world/world.cpp +++ b/source/game/world/world.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -2031,7 +2031,7 @@ namespace Game { } // FIXME: This was commented out while working on issue 13 - // + // // // The check may not be needed or it may need to be re-written diff --git a/source/glest_game/world/world.h b/source/game/world/world.h similarity index 98% rename from source/glest_game/world/world.h rename to source/game/world/world.h index a0bd6bf18..695e70ce9 100644 --- a/source/glest_game/world/world.h +++ b/source/game/world/world.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_map_editor/CMakeLists.txt b/source/map_editor/CMakeLists.txt similarity index 85% rename from source/glest_map_editor/CMakeLists.txt rename to source/map_editor/CMakeLists.txt index cd2488248..54fbe3e77 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/map_editor/CMakeLists.txt @@ -1,7 +1,7 @@ # common libraries OPTION(BUILD_MAP_EDITOR "Build map editor" ON) -SET(TARGET_NAME "zetaglest_editor") +SET(TARGET_NAME "glest_editor") MESSAGE(STATUS "Build ${TARGET_NAME} = ${BUILD_MAP_EDITOR}") IF(BUILD_MAP_EDITOR) @@ -75,12 +75,12 @@ IF(BUILD_MAP_EDITOR) ENDIF() ######################################################################################### - # megaglest map editor + # glest map editor SET(DIRS_WITH_SRC . ) - SET(GLEST_MAIN_INCLUDE_ROOT "../glest_game/") + SET(GLEST_MAIN_INCLUDE_ROOT "../game/") SET(GLEST_LIB_INCLUDE_ROOT "../shared_lib/include/") SET(GLEST_LIB_INCLUDE_DIRS @@ -109,44 +109,44 @@ IF(BUILD_MAP_EDITOR) ENDIF() INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/${SDL_VERSION_SNAME} ) - SET(ZG_SOURCE_FILES "../glest_game/global/config.cpp") + SET(GLEST_SOURCE_FILES "../game/global/config.cpp") FOREACH(DIR IN LISTS DIRS_WITH_SRC) INCLUDE_DIRECTORIES( ${DIR} ) set(SRC_DIR_TO_GLOB ${DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB INCLUDE_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.h) - SET(ZG_INCLUDE_FILES ${ZG_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR}) + SET(GLEST_INCLUDE_FILES ${GLEST_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR}) IF(APPLE) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.m) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) ENDIF(APPLE) ENDFOREACH(DIR) - SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) + SET_SOURCE_FILES_PROPERTIES(${GLEST_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) - ADD_EXECUTABLE(${TARGET_NAME} ${ZG_SOURCE_FILES} ${ZG_INCLUDE_FILES}) + ADD_EXECUTABLE(${TARGET_NAME} ${GLEST_SOURCE_FILES} ${GLEST_INCLUDE_FILES}) - SET(MG_STREFLOP "") + SET(GLEST_STREFLOP "") IF(WANT_USE_STREFLOP) - SET(MG_STREFLOP "streflop") + SET(GLEST_STREFLOP "streflop") ENDIF() IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${MG_STREFLOP} libzetaglest stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${GLEST_STREFLOP} libglest stdc++ moldname mingwex msvcrt user32 kernel32) ENDIF() IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND) - TARGET_LINK_LIBRARIES(${TARGET_NAME} ${MG_STREFLOP}) + TARGET_LINK_LIBRARIES(${TARGET_NAME} ${GLEST_STREFLOP}) ENDIF() - TARGET_LINK_LIBRARIES(${TARGET_NAME} libzetaglest) + TARGET_LINK_LIBRARIES(${TARGET_NAME} libglest) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) # Installation of the program diff --git a/source/glest_map_editor/icons.h b/source/map_editor/icons.h similarity index 100% rename from source/glest_map_editor/icons.h rename to source/map_editor/icons.h diff --git a/source/glest_map_editor/icons/brush_gradient_0.xpm b/source/map_editor/icons/brush_gradient_0.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_0.xpm rename to source/map_editor/icons/brush_gradient_0.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_n1.xpm b/source/map_editor/icons/brush_gradient_n1.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_n1.xpm rename to source/map_editor/icons/brush_gradient_n1.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_n2.xpm b/source/map_editor/icons/brush_gradient_n2.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_n2.xpm rename to source/map_editor/icons/brush_gradient_n2.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_n3.xpm b/source/map_editor/icons/brush_gradient_n3.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_n3.xpm rename to source/map_editor/icons/brush_gradient_n3.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_n4.xpm b/source/map_editor/icons/brush_gradient_n4.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_n4.xpm rename to source/map_editor/icons/brush_gradient_n4.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_n5.xpm b/source/map_editor/icons/brush_gradient_n5.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_n5.xpm rename to source/map_editor/icons/brush_gradient_n5.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_p1.xpm b/source/map_editor/icons/brush_gradient_p1.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_p1.xpm rename to source/map_editor/icons/brush_gradient_p1.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_p2.xpm b/source/map_editor/icons/brush_gradient_p2.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_p2.xpm rename to source/map_editor/icons/brush_gradient_p2.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_p3.xpm b/source/map_editor/icons/brush_gradient_p3.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_p3.xpm rename to source/map_editor/icons/brush_gradient_p3.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_p4.xpm b/source/map_editor/icons/brush_gradient_p4.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_p4.xpm rename to source/map_editor/icons/brush_gradient_p4.xpm diff --git a/source/glest_map_editor/icons/brush_gradient_p5.xpm b/source/map_editor/icons/brush_gradient_p5.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_gradient_p5.xpm rename to source/map_editor/icons/brush_gradient_p5.xpm diff --git a/source/glest_map_editor/icons/brush_height_0.xpm b/source/map_editor/icons/brush_height_0.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_0.xpm rename to source/map_editor/icons/brush_height_0.xpm diff --git a/source/glest_map_editor/icons/brush_height_n1.xpm b/source/map_editor/icons/brush_height_n1.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_n1.xpm rename to source/map_editor/icons/brush_height_n1.xpm diff --git a/source/glest_map_editor/icons/brush_height_n2.xpm b/source/map_editor/icons/brush_height_n2.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_n2.xpm rename to source/map_editor/icons/brush_height_n2.xpm diff --git a/source/glest_map_editor/icons/brush_height_n3.xpm b/source/map_editor/icons/brush_height_n3.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_n3.xpm rename to source/map_editor/icons/brush_height_n3.xpm diff --git a/source/glest_map_editor/icons/brush_height_n4.xpm b/source/map_editor/icons/brush_height_n4.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_n4.xpm rename to source/map_editor/icons/brush_height_n4.xpm diff --git a/source/glest_map_editor/icons/brush_height_n5.xpm b/source/map_editor/icons/brush_height_n5.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_n5.xpm rename to source/map_editor/icons/brush_height_n5.xpm diff --git a/source/glest_map_editor/icons/brush_height_p1.xpm b/source/map_editor/icons/brush_height_p1.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_p1.xpm rename to source/map_editor/icons/brush_height_p1.xpm diff --git a/source/glest_map_editor/icons/brush_height_p2.xpm b/source/map_editor/icons/brush_height_p2.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_p2.xpm rename to source/map_editor/icons/brush_height_p2.xpm diff --git a/source/glest_map_editor/icons/brush_height_p3.xpm b/source/map_editor/icons/brush_height_p3.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_p3.xpm rename to source/map_editor/icons/brush_height_p3.xpm diff --git a/source/glest_map_editor/icons/brush_height_p4.xpm b/source/map_editor/icons/brush_height_p4.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_p4.xpm rename to source/map_editor/icons/brush_height_p4.xpm diff --git a/source/glest_map_editor/icons/brush_height_p5.xpm b/source/map_editor/icons/brush_height_p5.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_height_p5.xpm rename to source/map_editor/icons/brush_height_p5.xpm diff --git a/source/glest_map_editor/icons/brush_none.xpm b/source/map_editor/icons/brush_none.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_none.xpm rename to source/map_editor/icons/brush_none.xpm diff --git a/source/glest_map_editor/icons/brush_object_bush.xpm b/source/map_editor/icons/brush_object_bush.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_bush.xpm rename to source/map_editor/icons/brush_object_bush.xpm diff --git a/source/glest_map_editor/icons/brush_object_c1-bigtree.xpm b/source/map_editor/icons/brush_object_c1-bigtree.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_c1-bigtree.xpm rename to source/map_editor/icons/brush_object_c1-bigtree.xpm diff --git a/source/glest_map_editor/icons/brush_object_c2-hanged.xpm b/source/map_editor/icons/brush_object_c2-hanged.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_c2-hanged.xpm rename to source/map_editor/icons/brush_object_c2-hanged.xpm diff --git a/source/glest_map_editor/icons/brush_object_c3-statue.xpm b/source/map_editor/icons/brush_object_c3-statue.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_c3-statue.xpm rename to source/map_editor/icons/brush_object_c3-statue.xpm diff --git a/source/glest_map_editor/icons/brush_object_c4-bigrock.xpm b/source/map_editor/icons/brush_object_c4-bigrock.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_c4-bigrock.xpm rename to source/map_editor/icons/brush_object_c4-bigrock.xpm diff --git a/source/glest_map_editor/icons/brush_object_c5-blocking.xpm b/source/map_editor/icons/brush_object_c5-blocking.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_c5-blocking.xpm rename to source/map_editor/icons/brush_object_c5-blocking.xpm diff --git a/source/glest_map_editor/icons/brush_object_dead-tree.xpm b/source/map_editor/icons/brush_object_dead-tree.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_dead-tree.xpm rename to source/map_editor/icons/brush_object_dead-tree.xpm diff --git a/source/glest_map_editor/icons/brush_object_stone.xpm b/source/map_editor/icons/brush_object_stone.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_stone.xpm rename to source/map_editor/icons/brush_object_stone.xpm diff --git a/source/glest_map_editor/icons/brush_object_tree.xpm b/source/map_editor/icons/brush_object_tree.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_tree.xpm rename to source/map_editor/icons/brush_object_tree.xpm diff --git a/source/glest_map_editor/icons/brush_object_water-object.xpm b/source/map_editor/icons/brush_object_water-object.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_object_water-object.xpm rename to source/map_editor/icons/brush_object_water-object.xpm diff --git a/source/glest_map_editor/icons/brush_players_blue.xpm b/source/map_editor/icons/brush_players_blue.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_blue.xpm rename to source/map_editor/icons/brush_players_blue.xpm diff --git a/source/glest_map_editor/icons/brush_players_cyan.xpm b/source/map_editor/icons/brush_players_cyan.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_cyan.xpm rename to source/map_editor/icons/brush_players_cyan.xpm diff --git a/source/glest_map_editor/icons/brush_players_green.xpm b/source/map_editor/icons/brush_players_green.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_green.xpm rename to source/map_editor/icons/brush_players_green.xpm diff --git a/source/glest_map_editor/icons/brush_players_orange.xpm b/source/map_editor/icons/brush_players_orange.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_orange.xpm rename to source/map_editor/icons/brush_players_orange.xpm diff --git a/source/glest_map_editor/icons/brush_players_pink.xpm b/source/map_editor/icons/brush_players_pink.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_pink.xpm rename to source/map_editor/icons/brush_players_pink.xpm diff --git a/source/glest_map_editor/icons/brush_players_player.xpm b/source/map_editor/icons/brush_players_player.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_player.xpm rename to source/map_editor/icons/brush_players_player.xpm diff --git a/source/glest_map_editor/icons/brush_players_red.xpm b/source/map_editor/icons/brush_players_red.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_red.xpm rename to source/map_editor/icons/brush_players_red.xpm diff --git a/source/glest_map_editor/icons/brush_players_white.xpm b/source/map_editor/icons/brush_players_white.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_white.xpm rename to source/map_editor/icons/brush_players_white.xpm diff --git a/source/glest_map_editor/icons/brush_players_yellow.xpm b/source/map_editor/icons/brush_players_yellow.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_players_yellow.xpm rename to source/map_editor/icons/brush_players_yellow.xpm diff --git a/source/glest_map_editor/icons/brush_resource_1-gold.xpm b/source/map_editor/icons/brush_resource_1-gold.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_resource_1-gold.xpm rename to source/map_editor/icons/brush_resource_1-gold.xpm diff --git a/source/glest_map_editor/icons/brush_resource_2-stone.xpm b/source/map_editor/icons/brush_resource_2-stone.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_resource_2-stone.xpm rename to source/map_editor/icons/brush_resource_2-stone.xpm diff --git a/source/glest_map_editor/icons/brush_resource_3.xpm b/source/map_editor/icons/brush_resource_3.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_resource_3.xpm rename to source/map_editor/icons/brush_resource_3.xpm diff --git a/source/glest_map_editor/icons/brush_resource_4.xpm b/source/map_editor/icons/brush_resource_4.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_resource_4.xpm rename to source/map_editor/icons/brush_resource_4.xpm diff --git a/source/glest_map_editor/icons/brush_resource_5.xpm b/source/map_editor/icons/brush_resource_5.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_resource_5.xpm rename to source/map_editor/icons/brush_resource_5.xpm diff --git a/source/glest_map_editor/icons/brush_surface_custom.xpm b/source/map_editor/icons/brush_surface_custom.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_surface_custom.xpm rename to source/map_editor/icons/brush_surface_custom.xpm diff --git a/source/glest_map_editor/icons/brush_surface_grass1.xpm b/source/map_editor/icons/brush_surface_grass1.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_surface_grass1.xpm rename to source/map_editor/icons/brush_surface_grass1.xpm diff --git a/source/glest_map_editor/icons/brush_surface_grass2.xpm b/source/map_editor/icons/brush_surface_grass2.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_surface_grass2.xpm rename to source/map_editor/icons/brush_surface_grass2.xpm diff --git a/source/glest_map_editor/icons/brush_surface_road.xpm b/source/map_editor/icons/brush_surface_road.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_surface_road.xpm rename to source/map_editor/icons/brush_surface_road.xpm diff --git a/source/glest_map_editor/icons/brush_surface_stone.xpm b/source/map_editor/icons/brush_surface_stone.xpm similarity index 100% rename from source/glest_map_editor/icons/brush_surface_stone.xpm rename to source/map_editor/icons/brush_surface_stone.xpm diff --git a/source/glest_map_editor/icons/edit_randomize-heights.xpm b/source/map_editor/icons/edit_randomize-heights.xpm similarity index 100% rename from source/glest_map_editor/icons/edit_randomize-heights.xpm rename to source/map_editor/icons/edit_randomize-heights.xpm diff --git a/source/glest_map_editor/icons/edit_randomize.xpm b/source/map_editor/icons/edit_randomize.xpm similarity index 100% rename from source/glest_map_editor/icons/edit_randomize.xpm rename to source/map_editor/icons/edit_randomize.xpm diff --git a/source/glest_map_editor/icons/edit_redo.xpm b/source/map_editor/icons/edit_redo.xpm similarity index 100% rename from source/glest_map_editor/icons/edit_redo.xpm rename to source/map_editor/icons/edit_redo.xpm diff --git a/source/glest_map_editor/icons/edit_switch-surfaces.xpm b/source/map_editor/icons/edit_switch-surfaces.xpm similarity index 100% rename from source/glest_map_editor/icons/edit_switch-surfaces.xpm rename to source/map_editor/icons/edit_switch-surfaces.xpm diff --git a/source/glest_map_editor/icons/edit_undo.xpm b/source/map_editor/icons/edit_undo.xpm similarity index 100% rename from source/glest_map_editor/icons/edit_undo.xpm rename to source/map_editor/icons/edit_undo.xpm diff --git a/source/glest_map_editor/icons/radius_1.xpm b/source/map_editor/icons/radius_1.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_1.xpm rename to source/map_editor/icons/radius_1.xpm diff --git a/source/glest_map_editor/icons/radius_2.xpm b/source/map_editor/icons/radius_2.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_2.xpm rename to source/map_editor/icons/radius_2.xpm diff --git a/source/glest_map_editor/icons/radius_3.xpm b/source/map_editor/icons/radius_3.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_3.xpm rename to source/map_editor/icons/radius_3.xpm diff --git a/source/glest_map_editor/icons/radius_4.xpm b/source/map_editor/icons/radius_4.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_4.xpm rename to source/map_editor/icons/radius_4.xpm diff --git a/source/glest_map_editor/icons/radius_5.xpm b/source/map_editor/icons/radius_5.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_5.xpm rename to source/map_editor/icons/radius_5.xpm diff --git a/source/glest_map_editor/icons/radius_6.xpm b/source/map_editor/icons/radius_6.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_6.xpm rename to source/map_editor/icons/radius_6.xpm diff --git a/source/glest_map_editor/icons/radius_7.xpm b/source/map_editor/icons/radius_7.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_7.xpm rename to source/map_editor/icons/radius_7.xpm diff --git a/source/glest_map_editor/icons/radius_8.xpm b/source/map_editor/icons/radius_8.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_8.xpm rename to source/map_editor/icons/radius_8.xpm diff --git a/source/glest_map_editor/icons/radius_9.xpm b/source/map_editor/icons/radius_9.xpm similarity index 100% rename from source/glest_map_editor/icons/radius_9.xpm rename to source/map_editor/icons/radius_9.xpm diff --git a/source/glest_map_editor/main.cpp b/source/map_editor/main.cpp similarity index 98% rename from source/glest_map_editor/main.cpp rename to source/map_editor/main.cpp index 34f814bf5..882a58782 100644 --- a/source/glest_map_editor/main.cpp +++ b/source/map_editor/main.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -56,7 +56,7 @@ namespace Game { } namespace MapEditor { - const string MainWindow::winHeader = string("ZetaGlest Map Editor ") + MapEditorVersionString; + const string MainWindow::winHeader = string("Glest Map Editor ") + MapEditorVersionString; // =============================================== // class Global functions @@ -563,19 +563,6 @@ namespace MapEditor { } void MainWindow::setExtension() { - /*if (currentFile.empty() || program == NULL) { - return; - } - - string extnsn = ext(currentFile); - - //printf("#A currentFile [%s] extnsn [%s]\n",currentFile.c_str(),extnsn.c_str()); - - if (extnsn == "gbm" || extnsn == "mgm") { - currentFile = cutLastExt(currentFile); - } - SetStatusText(wxT(".zgm"), siFILE_TYPE); - currentFile += ".zgm";*/ } void MainWindow::onMouseDown(wxMouseEvent &event, int x, int y) { @@ -1187,7 +1174,7 @@ namespace MapEditor { void MainWindow::onMenuViewAbout(wxCommandEvent &event) { MsgDialog( this, - wxT("\n ZetaGlest Map Editor\n Copyright 2004-2010 The Glest Team\n Copyright 2010-2017 The MegaGlest Team\n Copyright 2018-now The ZetaGlest Team \n"), + wxT("\n Glest Map Editor\n Copyright 2004-2019 The Glest Team\n \n"), wxT("About")).ShowModal(); } @@ -1644,8 +1631,8 @@ wxT("Help")).ShowModal(); string fileparam; if (argc == 2) { if (argv[1][0] == '-') { // any flag gives help and exits program. - std::cout << std::endl << "ZetaGlest Map Editor " << MapEditorVersionString << " [Using " << (const char *) wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl; - std::cout << "Creates or edits ZetaGlest maps. [.mgm]" << std::endl << std::endl; + std::cout << std::endl << "Glest Map Editor " << MapEditorVersionString << " [Using " << (const char *) wxConvCurrent->cWX2MB(wxVERSION_STRING) << "]" << std::endl << std::endl; + std::cout << "Creates or edits Glest maps. [.mgm]" << std::endl << std::endl; std::cout << "Draw with left mouse button." << std::endl; std::cout << "Move map with right mouse button." << std::endl; std::cout << "Zoom with middle mouse button or mousewheel." << std::endl; diff --git a/source/glest_map_editor/main.h b/source/map_editor/main.h similarity index 98% rename from source/glest_map_editor/main.h rename to source/map_editor/main.h index bab7e9d4d..05bceb354 100644 --- a/source/glest_map_editor/main.h +++ b/source/map_editor/main.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_map_editor/program.cpp b/source/map_editor/program.cpp similarity index 99% rename from source/glest_map_editor/program.cpp rename to source/map_editor/program.cpp index 44f3819a1..a97be58c7 100644 --- a/source/glest_map_editor/program.cpp +++ b/source/map_editor/program.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/glest_map_editor/program.h b/source/map_editor/program.h similarity index 96% rename from source/glest_map_editor/program.h rename to source/map_editor/program.h index 114a99792..f6d4632d3 100644 --- a/source/glest_map_editor/program.h +++ b/source/map_editor/program.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 7160de59e..eb8a5b403 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -46,10 +46,10 @@ ENDIF() # common libraries SET(EXTERNAL_LIBS "") -SET(TARGET_NAME "libzetaglest") +SET(TARGET_NAME "libglest") -IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) - MESSAGE(STATUS "Building ZetaGlest shared library...") +IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_GLEST) + MESSAGE(STATUS "Building Glest shared library...") INCLUDE (CheckIncludeFiles) @@ -194,7 +194,7 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) IF (FORCE_EMBEDDED_LIBS OR NOT ZLIB_FOUND) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} - # miniz is a library included with the ZG distribution. Not as + # miniz is a library included with the game distribution. Not as # developed as zlib, but smaller, and uses the same function names # so basically a replacement for miniz. We may one day replace # miniz with the zlib sources @@ -295,58 +295,58 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/unix) ENDIF() - SET(ZG_INCLUDES_ROOT "include/") - SET(ZG_SOURCES_ROOT "sources/") - SET(ZG_INCLUDE_FILES "") - SET(ZG_SOURCE_FILES "") - INCLUDE_DIRECTORIES( ${ZG_INCLUDES_ROOT}platform/${SDL_VERSION_SNAME} ) - INCLUDE_DIRECTORIES( ${ZG_INCLUDES_ROOT}xml/rapidxml ) + SET(GLEST_INCLUDES_ROOT "include/") + SET(GLEST_SOURCES_ROOT "sources/") + SET(GLEST_INCLUDE_FILES "") + SET(GLEST_SOURCE_FILES "") + INCLUDE_DIRECTORIES( ${GLEST_INCLUDES_ROOT}platform/${SDL_VERSION_SNAME} ) + INCLUDE_DIRECTORIES( ${GLEST_INCLUDES_ROOT}xml/rapidxml ) INCLUDE_DIRECTORIES("sources/") IF(WIN32) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/socket.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/miniftpserver.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/miniftpclient.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/gl_wrap.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/thread.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/window.cpp) - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/window_gl.cpp) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/socket.cpp) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/miniftpserver.cpp) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/posix/miniftpclient.cpp) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/gl_wrap.cpp) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/thread.cpp) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/window.cpp) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/platform/${SDL_VERSION_SNAME}/window_gl.cpp) ENDIF() FOREACH(DIR IN LISTS DIRS_WITH_SRC) - set(INCLUDE_DIR_TO_GLOB ${ZG_INCLUDES_ROOT}${DIR}) + set(INCLUDE_DIR_TO_GLOB ${GLEST_INCLUDES_ROOT}${DIR}) INCLUDE_DIRECTORIES( ${INCLUDE_DIR_TO_GLOB} ) IF(APPLE) #MESSAGE(STATUS "INCLUDE_DIR_TO_GLOB: ${INCLUDE_DIR_TO_GLOB}") FILE(GLOB INC_FILES_FROM_THIS_DIR ${INCLUDE_DIR_TO_GLOB}/*.h) #MESSAGE(STATUS "INCLUDE FILES GLOBBED: ${INC_FILES_FROM_THIS_DIR}") - SET(ZG_INCLUDE_FILES ${ZG_INCLUDE_FILES} ${INC_FILES_FROM_THIS_DIR}) + SET(GLEST_INCLUDE_FILES ${GLEST_INCLUDE_FILES} ${INC_FILES_FROM_THIS_DIR}) ENDIF(APPLE) - set(SRC_DIR_TO_GLOB ${ZG_SOURCES_ROOT}${DIR}) + set(SRC_DIR_TO_GLOB ${GLEST_SOURCES_ROOT}${DIR}) #MESSAGE(STATUS "SRC_DIR_TO_GLOB: ${SRC_DIR_TO_GLOB}") FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) - set(SRC_DIR_TO_GLOB ${ZG_SOURCES_ROOT}${DIR}) + set(SRC_DIR_TO_GLOB ${GLEST_SOURCES_ROOT}${DIR}) #MESSAGE(STATUS "SRC_DIR_TO_GLOB: ${SRC_DIR_TO_GLOB}") FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.c) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) IF(APPLE) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.m) #MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}") - SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) + SET(GLEST_SOURCE_FILES ${GLEST_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) ENDIF(APPLE) ENDFOREACH(DIR) - #MESSAGE(STATUS "Source files: ${ZG_INCLUDE_FILES}") - #MESSAGE(STATUS "Source files: ${ZG_SOURCE_FILES}") + #MESSAGE(STATUS "Source files: ${GLEST_INCLUDE_FILES}") + #MESSAGE(STATUS "Source files: ${GLEST_SOURCE_FILES}") #MESSAGE(STATUS "Include dirs: ${INCLUDE_DIRECTORIES}") IF(APPLE) @@ -357,27 +357,27 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST) SET(PLATFORM_SPECIFIC_DEFINES "-DX11_AVAILABLE -DHAVE_SYS_IOCTL_H") ENDIF() - SET_SOURCE_FILES_PROPERTIES(${ZG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS + SET_SOURCE_FILES_PROPERTIES(${GLEST_SOURCE_FILES} PROPERTIES COMPILE_FLAGS "${PLATFORM_SPECIFIC_DEFINES} ${STREFLOP_PROPERTIES} ${CXXFLAGS}") - SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) + SET_SOURCE_FILES_PROPERTIES(${GLEST_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) IF(NOT WIN32) - ADD_LIBRARY(${TARGET_NAME} STATIC ${ZG_SOURCE_FILES} ${ZG_INCLUDE_FILES}) - set_target_properties(libzetaglest PROPERTIES PREFIX "") + ADD_LIBRARY(${TARGET_NAME} STATIC ${GLEST_SOURCE_FILES} ${GLEST_INCLUDE_FILES}) + set_target_properties(libglest PROPERTIES PREFIX "") #MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]") ELSE() - SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game) - ADD_LIBRARY(${TARGET_NAME} STATIC ${ZG_SOURCE_FILES} ${ZG_INCLUDE_FILES}) + SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/game) + ADD_LIBRARY(${TARGET_NAME} STATIC ${GLEST_SOURCE_FILES} ${GLEST_INCLUDE_FILES}) MESSAGE(STATUS "Building shared game library as a SHARED library and saving to [${LIBRARY_OUTPUT_PATH}]") ENDIF() MESSAGE(STATUS "EXTERNAL_LIBS = [${EXTERNAL_LIBS}]") - OPTION(MINIUPNP_DEBUG_BUILD "Build ZetaGlest with UPNP DEBUG enabled" OFF) + OPTION(MINIUPNP_DEBUG_BUILD "Build Glest with UPNP DEBUG enabled" OFF) MARK_AS_ADVANCED(MINIUPNP_DEBUG_BUILD) IF(MINIUPNP_DEBUG_BUILD) - MESSAGE(STATUS "Building ZetaGlest shared library with DEBUG info for UPNP...") + MESSAGE(STATUS "Building Glest shared library with DEBUG info for UPNP...") ADD_DEFINITIONS("-DDEBUG") ENDIF() diff --git a/source/shared_lib/include/compression/compression_utils.h b/source/shared_lib/include/compression/compression_utils.h index 177e722d4..5bde287b5 100644 --- a/source/shared_lib/include/compression/compression_utils.h +++ b/source/shared_lib/include/compression/compression_utils.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/BMPReader.h b/source/shared_lib/include/graphics/BMPReader.h index b93464b18..833765059 100644 --- a/source/shared_lib/include/graphics/BMPReader.h +++ b/source/shared_lib/include/graphics/BMPReader.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/FileReader.h b/source/shared_lib/include/graphics/FileReader.h index 3901aee46..e337da648 100644 --- a/source/shared_lib/include/graphics/FileReader.h +++ b/source/shared_lib/include/graphics/FileReader.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/ImageReaders.h b/source/shared_lib/include/graphics/ImageReaders.h index cf0749af3..8d39e7698 100644 --- a/source/shared_lib/include/graphics/ImageReaders.h +++ b/source/shared_lib/include/graphics/ImageReaders.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/JPGReader.h b/source/shared_lib/include/graphics/JPGReader.h index 4470cd3dc..2d22d1729 100644 --- a/source/shared_lib/include/graphics/JPGReader.h +++ b/source/shared_lib/include/graphics/JPGReader.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/PNGReader.h b/source/shared_lib/include/graphics/PNGReader.h index b21ced260..3f99a1b80 100644 --- a/source/shared_lib/include/graphics/PNGReader.h +++ b/source/shared_lib/include/graphics/PNGReader.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/TGAReader.h b/source/shared_lib/include/graphics/TGAReader.h index 736e1a86a..fcd72e0ac 100644 --- a/source/shared_lib/include/graphics/TGAReader.h +++ b/source/shared_lib/include/graphics/TGAReader.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/buffer.h b/source/shared_lib/include/graphics/buffer.h index e63477cd0..cefb11a58 100644 --- a/source/shared_lib/include/graphics/buffer.h +++ b/source/shared_lib/include/graphics/buffer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/camera.h b/source/shared_lib/include/graphics/camera.h index 453cca9e3..503d130b0 100644 --- a/source/shared_lib/include/graphics/camera.h +++ b/source/shared_lib/include/graphics/camera.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/context.h b/source/shared_lib/include/graphics/context.h index 1f928d5d5..82008fba0 100644 --- a/source/shared_lib/include/graphics/context.h +++ b/source/shared_lib/include/graphics/context.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/font.h b/source/shared_lib/include/graphics/font.h index ee7e1258f..965238fb5 100644 --- a/source/shared_lib/include/graphics/font.h +++ b/source/shared_lib/include/graphics/font.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/font_manager.h b/source/shared_lib/include/graphics/font_manager.h index ee493b920..4245a3b18 100644 --- a/source/shared_lib/include/graphics/font_manager.h +++ b/source/shared_lib/include/graphics/font_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/font_text.h b/source/shared_lib/include/graphics/font_text.h index cab959732..1e0edf5b9 100644 --- a/source/shared_lib/include/graphics/font_text.h +++ b/source/shared_lib/include/graphics/font_text.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/base_renderer.h b/source/shared_lib/include/graphics/gl/base_renderer.h index 1d1885e1a..8ea3d2de6 100644 --- a/source/shared_lib/include/graphics/gl/base_renderer.h +++ b/source/shared_lib/include/graphics/gl/base_renderer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/context_gl.h b/source/shared_lib/include/graphics/gl/context_gl.h index 3911f27b7..130a81eee 100644 --- a/source/shared_lib/include/graphics/gl/context_gl.h +++ b/source/shared_lib/include/graphics/gl/context_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/font_gl.h b/source/shared_lib/include/graphics/gl/font_gl.h index f2aac35ff..2025e1d57 100644 --- a/source/shared_lib/include/graphics/gl/font_gl.h +++ b/source/shared_lib/include/graphics/gl/font_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/font_textFTGL.h b/source/shared_lib/include/graphics/gl/font_textFTGL.h index d83c28305..7c61204f4 100644 --- a/source/shared_lib/include/graphics/gl/font_textFTGL.h +++ b/source/shared_lib/include/graphics/gl/font_textFTGL.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/graphics_factory_basic_gl.h b/source/shared_lib/include/graphics/gl/graphics_factory_basic_gl.h index 45c0a6f49..d6738fa22 100644 --- a/source/shared_lib/include/graphics/gl/graphics_factory_basic_gl.h +++ b/source/shared_lib/include/graphics/gl/graphics_factory_basic_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/graphics_factory_gl.h b/source/shared_lib/include/graphics/gl/graphics_factory_gl.h index 57c4f1e47..1ab4358e4 100644 --- a/source/shared_lib/include/graphics/gl/graphics_factory_gl.h +++ b/source/shared_lib/include/graphics/gl/graphics_factory_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/model_gl.h b/source/shared_lib/include/graphics/gl/model_gl.h index c7abaefe7..08285c762 100644 --- a/source/shared_lib/include/graphics/gl/model_gl.h +++ b/source/shared_lib/include/graphics/gl/model_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/model_renderer_gl.h b/source/shared_lib/include/graphics/gl/model_renderer_gl.h index 080816229..b5bddc5ea 100644 --- a/source/shared_lib/include/graphics/gl/model_renderer_gl.h +++ b/source/shared_lib/include/graphics/gl/model_renderer_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/opengl.h b/source/shared_lib/include/graphics/gl/opengl.h index 1def9e310..3310fa572 100644 --- a/source/shared_lib/include/graphics/gl/opengl.h +++ b/source/shared_lib/include/graphics/gl/opengl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/particle_renderer_gl.h b/source/shared_lib/include/graphics/gl/particle_renderer_gl.h index 9474e5f81..1f41731ee 100644 --- a/source/shared_lib/include/graphics/gl/particle_renderer_gl.h +++ b/source/shared_lib/include/graphics/gl/particle_renderer_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/shader_gl.h b/source/shared_lib/include/graphics/gl/shader_gl.h index 4acbed1b1..f1d827c0c 100644 --- a/source/shared_lib/include/graphics/gl/shader_gl.h +++ b/source/shared_lib/include/graphics/gl/shader_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/text_renderer_gl.h b/source/shared_lib/include/graphics/gl/text_renderer_gl.h index e7e4e1710..fd266201c 100644 --- a/source/shared_lib/include/graphics/gl/text_renderer_gl.h +++ b/source/shared_lib/include/graphics/gl/text_renderer_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/gl/texture_gl.h b/source/shared_lib/include/graphics/gl/texture_gl.h index b19e50d42..3a767a6cc 100644 --- a/source/shared_lib/include/graphics/gl/texture_gl.h +++ b/source/shared_lib/include/graphics/gl/texture_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/graphics_factory.h b/source/shared_lib/include/graphics/graphics_factory.h index bdcd42ef0..9ead8a4c8 100644 --- a/source/shared_lib/include/graphics/graphics_factory.h +++ b/source/shared_lib/include/graphics/graphics_factory.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/graphics_interface.h b/source/shared_lib/include/graphics/graphics_interface.h index 36aa7699c..9310c53bf 100644 --- a/source/shared_lib/include/graphics/graphics_interface.h +++ b/source/shared_lib/include/graphics/graphics_interface.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/interpolation.h b/source/shared_lib/include/graphics/interpolation.h index 0f4c48cf0..30f99dd23 100644 --- a/source/shared_lib/include/graphics/interpolation.h +++ b/source/shared_lib/include/graphics/interpolation.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h index 687d5384e..21036dc17 100644 --- a/source/shared_lib/include/graphics/math_util.h +++ b/source/shared_lib/include/graphics/math_util.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/matrix.h b/source/shared_lib/include/graphics/matrix.h index bc787e1ea..18bb1ce55 100644 --- a/source/shared_lib/include/graphics/matrix.h +++ b/source/shared_lib/include/graphics/matrix.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/model.h b/source/shared_lib/include/graphics/model.h index d0288cbb2..0bf690b12 100644 --- a/source/shared_lib/include/graphics/model.h +++ b/source/shared_lib/include/graphics/model.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/model_header.h b/source/shared_lib/include/graphics/model_header.h index 8912d75e9..0c4ed8324 100644 --- a/source/shared_lib/include/graphics/model_header.h +++ b/source/shared_lib/include/graphics/model_header.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/model_manager.h b/source/shared_lib/include/graphics/model_manager.h index 201dda001..03ae7627a 100644 --- a/source/shared_lib/include/graphics/model_manager.h +++ b/source/shared_lib/include/graphics/model_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/model_renderer.h b/source/shared_lib/include/graphics/model_renderer.h index 57ba6812c..279652121 100644 --- a/source/shared_lib/include/graphics/model_renderer.h +++ b/source/shared_lib/include/graphics/model_renderer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/particle.h b/source/shared_lib/include/graphics/particle.h index 2afbcfc3c..335014a03 100644 --- a/source/shared_lib/include/graphics/particle.h +++ b/source/shared_lib/include/graphics/particle.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/particle_renderer.h b/source/shared_lib/include/graphics/particle_renderer.h index a00d56a72..4033da014 100644 --- a/source/shared_lib/include/graphics/particle_renderer.h +++ b/source/shared_lib/include/graphics/particle_renderer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/pixmap.h b/source/shared_lib/include/graphics/pixmap.h index 53ba3c8ce..f6cd94a43 100644 --- a/source/shared_lib/include/graphics/pixmap.h +++ b/source/shared_lib/include/graphics/pixmap.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/quaternion.h b/source/shared_lib/include/graphics/quaternion.h index a2d151c9a..95ffdf0bc 100644 --- a/source/shared_lib/include/graphics/quaternion.h +++ b/source/shared_lib/include/graphics/quaternion.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/shader.h b/source/shared_lib/include/graphics/shader.h index e89913bf9..c01866ed2 100644 --- a/source/shared_lib/include/graphics/shader.h +++ b/source/shared_lib/include/graphics/shader.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/shader_manager.h b/source/shared_lib/include/graphics/shader_manager.h index 6d016e6f5..fa0346849 100644 --- a/source/shared_lib/include/graphics/shader_manager.h +++ b/source/shared_lib/include/graphics/shader_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/text_renderer.h b/source/shared_lib/include/graphics/text_renderer.h index 77df06de8..89cb61814 100644 --- a/source/shared_lib/include/graphics/text_renderer.h +++ b/source/shared_lib/include/graphics/text_renderer.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/texture.h b/source/shared_lib/include/graphics/texture.h index eaac39d17..3f40fe11d 100644 --- a/source/shared_lib/include/graphics/texture.h +++ b/source/shared_lib/include/graphics/texture.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/texture_manager.h b/source/shared_lib/include/graphics/texture_manager.h index faae14e8a..2f13bdf67 100644 --- a/source/shared_lib/include/graphics/texture_manager.h +++ b/source/shared_lib/include/graphics/texture_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/vec.h b/source/shared_lib/include/graphics/vec.h index 56e586a6f..393dc1d16 100644 --- a/source/shared_lib/include/graphics/vec.h +++ b/source/shared_lib/include/graphics/vec.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/graphics/video_player.h b/source/shared_lib/include/graphics/video_player.h index 388d4edea..18c06ed0a 100644 --- a/source/shared_lib/include/graphics/video_player.h +++ b/source/shared_lib/include/graphics/video_player.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/lua/lua_script.h b/source/shared_lib/include/lua/lua_script.h index 4f7fcc0ce..85c9fa1e1 100644 --- a/source/shared_lib/include/lua/lua_script.h +++ b/source/shared_lib/include/lua/lua_script.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/map/map_preview.h b/source/shared_lib/include/map/map_preview.h index 59f93ea9b..51bbc254b 100644 --- a/source/shared_lib/include/map/map_preview.h +++ b/source/shared_lib/include/map/map_preview.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/base_thread.h b/source/shared_lib/include/platform/common/base_thread.h index 5dd3356e4..d72832050 100644 --- a/source/shared_lib/include/platform/common/base_thread.h +++ b/source/shared_lib/include/platform/common/base_thread.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/byte_order.h b/source/shared_lib/include/platform/common/byte_order.h index e9fd70087..2a945d6b0 100644 --- a/source/shared_lib/include/platform/common/byte_order.h +++ b/source/shared_lib/include/platform/common/byte_order.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/cache_manager.h b/source/shared_lib/include/platform/common/cache_manager.h index e8a0d6cb0..edd90996c 100644 --- a/source/shared_lib/include/platform/common/cache_manager.h +++ b/source/shared_lib/include/platform/common/cache_manager.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/common_scoped_ptr.h b/source/shared_lib/include/platform/common/common_scoped_ptr.h index 4bce4300b..3ab5a4cff 100644 --- a/source/shared_lib/include/platform/common/common_scoped_ptr.h +++ b/source/shared_lib/include/platform/common/common_scoped_ptr.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/math_wrapper.h b/source/shared_lib/include/platform/common/math_wrapper.h index 76f8f9e4e..a6fe64d04 100644 --- a/source/shared_lib/include/platform/common/math_wrapper.h +++ b/source/shared_lib/include/platform/common/math_wrapper.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/platform_common.h b/source/shared_lib/include/platform/common/platform_common.h index f9f693ab6..a7f656dc0 100644 --- a/source/shared_lib/include/platform/common/platform_common.h +++ b/source/shared_lib/include/platform/common/platform_common.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/shared_const.h b/source/shared_lib/include/platform/common/shared_const.h index 8a5048dab..10afd4b44 100644 --- a/source/shared_lib/include/platform/common/shared_const.h +++ b/source/shared_lib/include/platform/common/shared_const.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/common/simple_threads.h b/source/shared_lib/include/platform/common/simple_threads.h index 8d41af7e7..919c3c069 100644 --- a/source/shared_lib/include/platform/common/simple_threads.h +++ b/source/shared_lib/include/platform/common/simple_threads.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/miniupnpc/declspec.h b/source/shared_lib/include/platform/miniupnpc/declspec.h index cff84a3c8..e2b44dc51 100644 --- a/source/shared_lib/include/platform/miniupnpc/declspec.h +++ b/source/shared_lib/include/platform/miniupnpc/declspec.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/posix/miniftpclient.h b/source/shared_lib/include/platform/posix/miniftpclient.h index 88380d20b..7f4859647 100644 --- a/source/shared_lib/include/platform/posix/miniftpclient.h +++ b/source/shared_lib/include/platform/posix/miniftpclient.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/posix/miniftpserver.h b/source/shared_lib/include/platform/posix/miniftpserver.h index be5f23543..cc0047cf4 100644 --- a/source/shared_lib/include/platform/posix/miniftpserver.h +++ b/source/shared_lib/include/platform/posix/miniftpserver.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/posix/socket.h b/source/shared_lib/include/platform/posix/socket.h index 1c594f8c8..d11042c93 100644 --- a/source/shared_lib/include/platform/posix/socket.h +++ b/source/shared_lib/include/platform/posix/socket.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/data_types.h b/source/shared_lib/include/platform/sdl/data_types.h index e63053d9e..d5a5c47dc 100644 --- a/source/shared_lib/include/platform/sdl/data_types.h +++ b/source/shared_lib/include/platform/sdl/data_types.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/factory_repository.h b/source/shared_lib/include/platform/sdl/factory_repository.h index 079e62dda..a81e7e21d 100644 --- a/source/shared_lib/include/platform/sdl/factory_repository.h +++ b/source/shared_lib/include/platform/sdl/factory_repository.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/gl_wrap.h b/source/shared_lib/include/platform/sdl/gl_wrap.h index 7bb4bc66c..b0cdc8d8d 100644 --- a/source/shared_lib/include/platform/sdl/gl_wrap.h +++ b/source/shared_lib/include/platform/sdl/gl_wrap.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/noimpl.h b/source/shared_lib/include/platform/sdl/noimpl.h index 2e2cfd8df..135a8a90a 100644 --- a/source/shared_lib/include/platform/sdl/noimpl.h +++ b/source/shared_lib/include/platform/sdl/noimpl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/platform_main.h b/source/shared_lib/include/platform/sdl/platform_main.h index 7d286918b..de058a89b 100644 --- a/source/shared_lib/include/platform/sdl/platform_main.h +++ b/source/shared_lib/include/platform/sdl/platform_main.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -214,7 +214,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) { // the 'printf' statement // printf("\n\nUsage: %s [OPTION]... VALUE...\n\n\ -Options for running zetaglest from the command line\n\n\ +Options for running glest from the command line\n\n\ %s\n\ display usage", extractFileFromDirectoryPath(argv0).c_str(), @@ -361,7 +361,7 @@ GAME_ARGS[GAME_ARG_MOD]); *NOTE: This only applies when files are purged due to\n\ the above flags being set.\n\ example:\n\ - %s %s=zetapack,vbros_pack_5", + %s %s=factionpack,vbros_pack_5", GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES], extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]); @@ -453,7 +453,7 @@ GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]); printf("\n\n \t the original texture if its filesize is smaller than the"); printf("\n\n \t converted format."); printf("\n\n \texample:"); - printf("\n\n \t%s %s=techs/zetapack/factions/tech/", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_CONVERT_MODELS]); + printf("\n\n \t%s %s=techs/factionpack/factions/tech/", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_CONVERT_MODELS]); printf("\n\n \tunits/castle/models/castle.g3d=png=keepsmallest"); printf("\n\n%s=x \tForce the language to be the language specified", GAME_ARGS[GAME_ARG_USE_LANGUAGE]); @@ -471,7 +471,7 @@ GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]); printf("\n\n%s=x \tShow the calculated CRC for the techtree named x.", GAME_ARGS[GAME_ARG_SHOW_TECHTREE_CRC]); printf("\n\n \tWhere x is a techtree name."); - printf("\n\n \texample: %s %s=zetapack", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_TECHTREE_CRC]); + printf("\n\n \texample: %s %s=factionpack", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_TECHTREE_CRC]); printf("\n\n%s=x \tShow the calculated CRC for the scenario named x.", GAME_ARGS[GAME_ARG_SHOW_SCENARIO_CRC]); printf("\n\n \tWhere x is a scenario name."); @@ -481,7 +481,7 @@ GAME_ARGS[GAME_ARG_VALIDATE_TECHTREES]); printf("\n\n%s=x=y \tShow the calculated CRC for files in the path", GAME_ARGS[GAME_ARG_SHOW_PATH_CRC]); printf("\n\n \t located in x using file filter y."); printf("\n\n \tWhere x is a path name and y is file(s) filter."); - printf("\n\n \texample: %s %s=techs/=zetapack.7z", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_PATH_CRC]); + printf("\n\n \texample: %s %s=techs/=factionpack.7z", extractFileFromDirectoryPath(argv0).c_str(), GAME_ARGS[GAME_ARG_SHOW_PATH_CRC]); printf("\n\n%s \tDisables stack backtrace on errors.", GAME_ARGS[GAME_ARG_DISABLE_BACKTRACE]); diff --git a/source/shared_lib/include/platform/sdl/platform_util.h b/source/shared_lib/include/platform/sdl/platform_util.h index 57b70a3f1..2ec1b1cc4 100644 --- a/source/shared_lib/include/platform/sdl/platform_util.h +++ b/source/shared_lib/include/platform/sdl/platform_util.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/sdl_private.h b/source/shared_lib/include/platform/sdl/sdl_private.h index 43be12474..03995e3f1 100644 --- a/source/shared_lib/include/platform/sdl/sdl_private.h +++ b/source/shared_lib/include/platform/sdl/sdl_private.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/thread.h b/source/shared_lib/include/platform/sdl/thread.h index caefc61b6..51cd402b9 100644 --- a/source/shared_lib/include/platform/sdl/thread.h +++ b/source/shared_lib/include/platform/sdl/thread.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/window.h b/source/shared_lib/include/platform/sdl/window.h index 2e2a31b55..66a3f39c5 100644 --- a/source/shared_lib/include/platform/sdl/window.h +++ b/source/shared_lib/include/platform/sdl/window.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/platform/sdl/window_gl.h b/source/shared_lib/include/platform/sdl/window_gl.h index 99a65cd4c..ae41d04cc 100644 --- a/source/shared_lib/include/platform/sdl/window_gl.h +++ b/source/shared_lib/include/platform/sdl/window_gl.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/openal/sound_factory_openal.h b/source/shared_lib/include/sound/openal/sound_factory_openal.h index c3292efe9..cbb59cab2 100644 --- a/source/shared_lib/include/sound/openal/sound_factory_openal.h +++ b/source/shared_lib/include/sound/openal/sound_factory_openal.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/openal/sound_player_openal.h b/source/shared_lib/include/sound/openal/sound_player_openal.h index 6fac14d25..16bd64738 100644 --- a/source/shared_lib/include/sound/openal/sound_player_openal.h +++ b/source/shared_lib/include/sound/openal/sound_player_openal.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/sound.h b/source/shared_lib/include/sound/sound.h index 87398837e..8424596f3 100644 --- a/source/shared_lib/include/sound/sound.h +++ b/source/shared_lib/include/sound/sound.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/sound_factory.h b/source/shared_lib/include/sound/sound_factory.h index 22b609583..1e7448462 100644 --- a/source/shared_lib/include/sound/sound_factory.h +++ b/source/shared_lib/include/sound/sound_factory.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/sound_factory_none.h b/source/shared_lib/include/sound/sound_factory_none.h index 396d88fb3..c5830c26e 100644 --- a/source/shared_lib/include/sound/sound_factory_none.h +++ b/source/shared_lib/include/sound/sound_factory_none.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/sound_file_loader.h b/source/shared_lib/include/sound/sound_file_loader.h index 7912ceae3..9f23302b1 100644 --- a/source/shared_lib/include/sound/sound_file_loader.h +++ b/source/shared_lib/include/sound/sound_file_loader.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/sound_interface.h b/source/shared_lib/include/sound/sound_interface.h index f8ef1fc63..c0f4a95bf 100644 --- a/source/shared_lib/include/sound/sound_interface.h +++ b/source/shared_lib/include/sound/sound_interface.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/sound/sound_player.h b/source/shared_lib/include/sound/sound_player.h index a1f130321..bd1f43014 100644 --- a/source/shared_lib/include/sound/sound_player.h +++ b/source/shared_lib/include/sound/sound_player.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/checksum.h b/source/shared_lib/include/util/checksum.h index b95c8e03a..ce6a2572e 100644 --- a/source/shared_lib/include/util/checksum.h +++ b/source/shared_lib/include/util/checksum.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/conversion.h b/source/shared_lib/include/util/conversion.h index 14489c288..3d552fbc7 100644 --- a/source/shared_lib/include/util/conversion.h +++ b/source/shared_lib/include/util/conversion.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/factory.h b/source/shared_lib/include/util/factory.h index 6673559c7..bfe070cd2 100644 --- a/source/shared_lib/include/util/factory.h +++ b/source/shared_lib/include/util/factory.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/gen_uuid.h b/source/shared_lib/include/util/gen_uuid.h index 30aea8ac7..c1336ae85 100644 --- a/source/shared_lib/include/util/gen_uuid.h +++ b/source/shared_lib/include/util/gen_uuid.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/leak_dumper.h b/source/shared_lib/include/util/leak_dumper.h index b86286d29..3b07dcd46 100644 --- a/source/shared_lib/include/util/leak_dumper.h +++ b/source/shared_lib/include/util/leak_dumper.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/profiler.h b/source/shared_lib/include/util/profiler.h index 29e1e7cbc..37c877087 100644 --- a/source/shared_lib/include/util/profiler.h +++ b/source/shared_lib/include/util/profiler.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/properties.h b/source/shared_lib/include/util/properties.h index c98e01dd6..62daf1ee5 100644 --- a/source/shared_lib/include/util/properties.h +++ b/source/shared_lib/include/util/properties.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/randomgen.h b/source/shared_lib/include/util/randomgen.h index 4c38c87ce..6bbb06f52 100644 --- a/source/shared_lib/include/util/randomgen.h +++ b/source/shared_lib/include/util/randomgen.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/utf8.h b/source/shared_lib/include/util/utf8.h index 481605b6a..12c5389fc 100644 --- a/source/shared_lib/include/util/utf8.h +++ b/source/shared_lib/include/util/utf8.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/utf8/checked.h b/source/shared_lib/include/util/utf8/checked.h index e154158bd..2c3587580 100644 --- a/source/shared_lib/include/util/utf8/checked.h +++ b/source/shared_lib/include/util/utf8/checked.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/utf8/core.h b/source/shared_lib/include/util/utf8/core.h index 78bceec82..75a63766d 100644 --- a/source/shared_lib/include/util/utf8/core.h +++ b/source/shared_lib/include/util/utf8/core.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/utf8/unchecked.h b/source/shared_lib/include/util/utf8/unchecked.h index 9409c9b04..50022a2fd 100644 --- a/source/shared_lib/include/util/utf8/unchecked.h +++ b/source/shared_lib/include/util/utf8/unchecked.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/util/util.h b/source/shared_lib/include/util/util.h index d5d923df1..17fd760f8 100644 --- a/source/shared_lib/include/util/util.h +++ b/source/shared_lib/include/util/util.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/include/versions.h b/source/shared_lib/include/versions.h index ed756091e..0dea1b84e 100644 --- a/source/shared_lib/include/versions.h +++ b/source/shared_lib/include/versions.h @@ -1,4 +1,4 @@ -#define GAME_VERSION "ZetaGlest 1.0" +#define GAME_VERSION "Glest 1.0" #define GAME_BUILD_DATE "2601" #define G3D_VIEWER_VERSION "1.0" #define MAP_EDITOR_VERSION "1.0" diff --git a/source/shared_lib/include/xml/xml_parser.h b/source/shared_lib/include/xml/xml_parser.h index 561eb2413..129bfcaf5 100644 --- a/source/shared_lib/include/xml/xml_parser.h +++ b/source/shared_lib/include/xml/xml_parser.h @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/compression/compression_utils.cpp b/source/shared_lib/sources/compression/compression_utils.cpp index d00440f81..fd6ed1858 100644 --- a/source/shared_lib/sources/compression/compression_utils.cpp +++ b/source/shared_lib/sources/compression/compression_utils.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/BMPReader.cpp b/source/shared_lib/sources/graphics/BMPReader.cpp index 5ed104e24..0cd5cdbe3 100644 --- a/source/shared_lib/sources/graphics/BMPReader.cpp +++ b/source/shared_lib/sources/graphics/BMPReader.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/ImageReaders.cpp b/source/shared_lib/sources/graphics/ImageReaders.cpp index 362332b4f..bb124ad64 100644 --- a/source/shared_lib/sources/graphics/ImageReaders.cpp +++ b/source/shared_lib/sources/graphics/ImageReaders.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/JPGReader.cpp b/source/shared_lib/sources/graphics/JPGReader.cpp index a042378c2..7737b64c5 100644 --- a/source/shared_lib/sources/graphics/JPGReader.cpp +++ b/source/shared_lib/sources/graphics/JPGReader.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/PNGReader.cpp b/source/shared_lib/sources/graphics/PNGReader.cpp index 977314a2e..0ac40f3de 100644 --- a/source/shared_lib/sources/graphics/PNGReader.cpp +++ b/source/shared_lib/sources/graphics/PNGReader.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/TGAReader.cpp b/source/shared_lib/sources/graphics/TGAReader.cpp index 7db2d2736..317d08cd0 100644 --- a/source/shared_lib/sources/graphics/TGAReader.cpp +++ b/source/shared_lib/sources/graphics/TGAReader.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/buffer.cpp b/source/shared_lib/sources/graphics/buffer.cpp index 58e7b5b60..4430e6ef8 100644 --- a/source/shared_lib/sources/graphics/buffer.cpp +++ b/source/shared_lib/sources/graphics/buffer.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/camera.cpp b/source/shared_lib/sources/graphics/camera.cpp index 26be10a8e..fbbc95857 100644 --- a/source/shared_lib/sources/graphics/camera.cpp +++ b/source/shared_lib/sources/graphics/camera.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/context.cpp b/source/shared_lib/sources/graphics/context.cpp index b6de486f4..6c105f84e 100644 --- a/source/shared_lib/sources/graphics/context.cpp +++ b/source/shared_lib/sources/graphics/context.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/font.cpp b/source/shared_lib/sources/graphics/font.cpp index 67099bf66..589bf1dc3 100644 --- a/source/shared_lib/sources/graphics/font.cpp +++ b/source/shared_lib/sources/graphics/font.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -609,11 +609,11 @@ namespace Shared { } // Get user-specified font path - string zetaglest_font = safeCharPtrCopy(getenv("GAME_FONT"), 8095); - string zetaglest_font_family = safeCharPtrCopy(getenv("GAME_FONT_FAMILY"), 8095); - if (zetaglest_font != "" || zetaglest_font_family != "") { - if (zetaglest_font != "") { - tryFont = zetaglest_font; + string glest_font = safeCharPtrCopy(getenv("GAME_FONT"), 8095); + string glest_font_family = safeCharPtrCopy(getenv("GAME_FONT_FAMILY"), 8095); + if (glest_font != "" || glest_font_family != "") { + if (glest_font != "") { + tryFont = glest_font; if (Text::DEFAULT_FONT_PATH_ABSOLUTE != "") { tryFont = Text::DEFAULT_FONT_PATH_ABSOLUTE + "/" + extractFileFromDirectoryPath(tryFont); @@ -622,9 +622,9 @@ namespace Shared { replaceAll(tryFont, "/", "\\"); #endif - CHECK_FONT_PATH(tryFont.c_str(), zetaglest_font_family.c_str(), &font, &path); + CHECK_FONT_PATH(tryFont.c_str(), glest_font_family.c_str(), &font, &path); } else { - CHECK_FONT_PATH(NULL, zetaglest_font_family.c_str(), &font, &path); + CHECK_FONT_PATH(NULL, glest_font_family.c_str(), &font, &path); } } diff --git a/source/shared_lib/sources/graphics/font_manager.cpp b/source/shared_lib/sources/graphics/font_manager.cpp index e2ff92e55..07b353670 100644 --- a/source/shared_lib/sources/graphics/font_manager.cpp +++ b/source/shared_lib/sources/graphics/font_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/font_text.cpp b/source/shared_lib/sources/graphics/font_text.cpp index 359db6cd3..3d7ad0d85 100644 --- a/source/shared_lib/sources/graphics/font_text.cpp +++ b/source/shared_lib/sources/graphics/font_text.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/base_renderer.cpp b/source/shared_lib/sources/graphics/gl/base_renderer.cpp index 2b218019d..560a0d83f 100644 --- a/source/shared_lib/sources/graphics/gl/base_renderer.cpp +++ b/source/shared_lib/sources/graphics/gl/base_renderer.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/context_gl.cpp b/source/shared_lib/sources/graphics/gl/context_gl.cpp index 4200dc27a..6ee64e02d 100644 --- a/source/shared_lib/sources/graphics/gl/context_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/context_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/font_gl.cpp b/source/shared_lib/sources/graphics/gl/font_gl.cpp index df81369cf..4e9ae39a2 100644 --- a/source/shared_lib/sources/graphics/gl/font_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/font_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp b/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp index d64e91db7..76daf3faf 100644 --- a/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp +++ b/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/model_gl.cpp b/source/shared_lib/sources/graphics/gl/model_gl.cpp index a05361bac..5cc38726a 100644 --- a/source/shared_lib/sources/graphics/gl/model_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/model_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp b/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp index f42fe08eb..1cfc0e759 100644 --- a/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/opengl.cpp b/source/shared_lib/sources/graphics/gl/opengl.cpp index 84d16715f..470ad96e2 100644 --- a/source/shared_lib/sources/graphics/gl/opengl.cpp +++ b/source/shared_lib/sources/graphics/gl/opengl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/particle_renderer_gl.cpp b/source/shared_lib/sources/graphics/gl/particle_renderer_gl.cpp index c28c7ba49..06e1b2905 100644 --- a/source/shared_lib/sources/graphics/gl/particle_renderer_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/particle_renderer_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/shader_gl.cpp b/source/shared_lib/sources/graphics/gl/shader_gl.cpp index 76de52225..c039ceb7b 100644 --- a/source/shared_lib/sources/graphics/gl/shader_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/shader_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp b/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp index fb847b7ed..c8279467b 100644 --- a/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/gl/texture_gl.cpp b/source/shared_lib/sources/graphics/gl/texture_gl.cpp index dc27b257d..ec7580717 100644 --- a/source/shared_lib/sources/graphics/gl/texture_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/texture_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/graphics_interface.cpp b/source/shared_lib/sources/graphics/graphics_interface.cpp index 504e562b4..0d19f1439 100644 --- a/source/shared_lib/sources/graphics/graphics_interface.cpp +++ b/source/shared_lib/sources/graphics/graphics_interface.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/interpolation.cpp b/source/shared_lib/sources/graphics/interpolation.cpp index 66a84f34c..50c5a6542 100644 --- a/source/shared_lib/sources/graphics/interpolation.cpp +++ b/source/shared_lib/sources/graphics/interpolation.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/model.cpp b/source/shared_lib/sources/graphics/model.cpp index 1808ef146..b5b5b1a23 100644 --- a/source/shared_lib/sources/graphics/model.cpp +++ b/source/shared_lib/sources/graphics/model.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -2141,13 +2141,11 @@ namespace Shared { if (rendererModels.empty() == false) { if (PixelBufferWrapper::getIsPBOEnable() == true) { Pixmap2D *pixmapScreenShot = BaseColorPickEntity::pbo->getPixelBufferFor(x, y, w, h, COLOR_COMPONENTS); - //pixmapScreenShot->saveTga("/tmp/toll.tga"); //### for debugging cachedPixels.reset(pixmapScreenShot); } else { Pixmap2D *pixmapScreenShot = new Pixmap2D(w, h, COLOR_COMPONENTS); //glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(x, y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixmapScreenShot->getPixels()); - //pixmapScreenShot->saveTga("/tmp/toll.tga"); cachedPixels.reset(pixmapScreenShot); //glPixelStorei(GL_UNPACK_ALIGNMENT, 1); } diff --git a/source/shared_lib/sources/graphics/model_manager.cpp b/source/shared_lib/sources/graphics/model_manager.cpp index c6477b6da..55e6fff09 100644 --- a/source/shared_lib/sources/graphics/model_manager.cpp +++ b/source/shared_lib/sources/graphics/model_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/particle.cpp b/source/shared_lib/sources/graphics/particle.cpp index 5b2bb1e21..6caab45e3 100644 --- a/source/shared_lib/sources/graphics/particle.cpp +++ b/source/shared_lib/sources/graphics/particle.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/pixmap.cpp b/source/shared_lib/sources/graphics/pixmap.cpp index dffbaf3f7..307746f92 100644 --- a/source/shared_lib/sources/graphics/pixmap.cpp +++ b/source/shared_lib/sources/graphics/pixmap.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/quaternion.cpp b/source/shared_lib/sources/graphics/quaternion.cpp index 814baaa0b..1248a1040 100644 --- a/source/shared_lib/sources/graphics/quaternion.cpp +++ b/source/shared_lib/sources/graphics/quaternion.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/shader.cpp b/source/shared_lib/sources/graphics/shader.cpp index e35146cb3..a32ede20b 100644 --- a/source/shared_lib/sources/graphics/shader.cpp +++ b/source/shared_lib/sources/graphics/shader.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/shader_manager.cpp b/source/shared_lib/sources/graphics/shader_manager.cpp index 0c8e579ca..b3994afd2 100644 --- a/source/shared_lib/sources/graphics/shader_manager.cpp +++ b/source/shared_lib/sources/graphics/shader_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/texture.cpp b/source/shared_lib/sources/graphics/texture.cpp index a01a392b0..498237df6 100644 --- a/source/shared_lib/sources/graphics/texture.cpp +++ b/source/shared_lib/sources/graphics/texture.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/texture_manager.cpp b/source/shared_lib/sources/graphics/texture_manager.cpp index 682fa3c8f..dfc82a066 100644 --- a/source/shared_lib/sources/graphics/texture_manager.cpp +++ b/source/shared_lib/sources/graphics/texture_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/graphics/video_player.cpp b/source/shared_lib/sources/graphics/video_player.cpp index c494789fd..57da57a9b 100644 --- a/source/shared_lib/sources/graphics/video_player.cpp +++ b/source/shared_lib/sources/graphics/video_player.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/lua/lua_script.cpp b/source/shared_lib/sources/lua/lua_script.cpp index 4a159b172..443b80a79 100644 --- a/source/shared_lib/sources/lua/lua_script.cpp +++ b/source/shared_lib/sources/lua/lua_script.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/map/map_preview.cpp b/source/shared_lib/sources/map/map_preview.cpp index d0f1ffffc..d66cca38a 100644 --- a/source/shared_lib/sources/map/map_preview.cpp +++ b/source/shared_lib/sources/map/map_preview.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -1115,17 +1115,13 @@ namespace Shared { endPathWithSlash(map_path); const string original = map_path + mapName; - const string zeta = map_path + mapName + ".zgm"; const string mega = map_path + mapName + ".mgm"; const string glest = map_path + mapName + ".gbm"; - if (( EndsWith(original, ".zgm") == true || - EndsWith(original, ".mgm") == true || + if ((EndsWith(original, ".mgm") == true || EndsWith(original, ".gbm") == true) && fileExists(original)) { return original; - } else if (fileExists(zeta)) { - return zeta; } else if (fileExists(mega)) { return mega; } else if (fileExists(glest)) { @@ -1155,10 +1151,6 @@ namespace Shared { findAll(path + "*.gbm", results2, cutExtension, false); copy(results2.begin(), results2.end(), std::inserter(allMaps2, allMaps2.begin())); - results2.clear(); - findAll(path + "*.zgm", results2, cutExtension, false); - copy(results2.begin(), results2.end(), std::inserter(allMaps2, allMaps2.begin())); - results2.clear(); findAll(path + "*.mgm", results2, cutExtension, false); copy(results2.begin(), results2.end(), std::inserter(allMaps2, allMaps2.begin())); @@ -1173,10 +1165,6 @@ namespace Shared { findAll(pathList, "*.gbm", results, cutExtension, false); copy(results.begin(), results.end(), std::inserter(allMaps, allMaps.begin())); - results.clear(); - findAll(pathList, "*.zgm", results, cutExtension, false); - copy(results.begin(), results.end(), std::inserter(allMaps, allMaps.begin())); - results.clear(); findAll(pathList, "*.mgm", results, cutExtension, false); copy(results.begin(), results.end(), std::inserter(allMaps, allMaps.begin())); diff --git a/source/shared_lib/sources/platform/common/base_thread.cpp b/source/shared_lib/sources/platform/common/base_thread.cpp index 2c6f7e22a..1e7603550 100644 --- a/source/shared_lib/sources/platform/common/base_thread.cpp +++ b/source/shared_lib/sources/platform/common/base_thread.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/common/cache_manager.cpp b/source/shared_lib/sources/platform/common/cache_manager.cpp index 182034043..b98d7ba88 100644 --- a/source/shared_lib/sources/platform/common/cache_manager.cpp +++ b/source/shared_lib/sources/platform/common/cache_manager.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp index ca01b1a35..a27904a13 100644 --- a/source/shared_lib/sources/platform/common/platform_common.cpp +++ b/source/shared_lib/sources/platform/common/platform_common.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -1753,46 +1753,46 @@ namespace Shared { replaceAll(context, "&", "&"); replaceAll(context, "<", "<"); replaceAll(context, ">", ">"); - //replaceAll(context,"Œ","Œ"); + //replaceAll(context,"Œ","??"); replaceAll(context, "Œ", "\xC5\x92\0"); - //replaceAll(context,"œ","œ"); + //replaceAll(context,"œ","??"); replaceAll(context, "œ", "\xC5\x93\0"); - //replaceAll(context,"Š","Š"); + //replaceAll(context,"Š","??"); replaceAll(context, "Š", "\xC5\xA0\0"); - //replaceAll(context,"š","š"); + //replaceAll(context,"š","??"); replaceAll(context, "š", "\xC5\xA1\0"); - //replaceAll(context,"Ÿ","Ÿ"); + //replaceAll(context,"Ÿ","??"); replaceAll(context, "Ÿ", "\xC5\xB8\0"); - replaceAll(context, "ˆ", "ˆ"); - replaceAll(context, "˜", "˜"); + replaceAll(context, "ˆ", "??"); + replaceAll(context, "˜", "??"); replaceAll(context, " ", " "); replaceAll(context, " ", " "); replaceAll(context, " ", " "); replaceAll(context, "–", "-"); replaceAll(context, "—", "-"); - //replaceAll(context,"‘","‘"); + //replaceAll(context,"‘","???"); replaceAll(context, "‘", "\xE2\x80\x98\0"); - //replaceAll(context,"’","’"); + //replaceAll(context,"’","???"); replaceAll(context, "’", "\xE2\x80\x99\0"); - //replaceAll(context,"‚","‚"); + //replaceAll(context,"‚","???"); replaceAll(context, "‚", "\xE2\x80\x9A\0"); - //replaceAll(context,"“","“"); + //replaceAll(context,"“","???"); replaceAll(context, "“", "\xE2\x80\x9C\0"); - //replaceAll(context,"”","”"); + //replaceAll(context,"”","???"); replaceAll(context, "”", "\xE2\x80\x9D\0"); - //replaceAll(context,"„","„"); + //replaceAll(context,"„","???"); replaceAll(context, "„", "\xE2\x80\x9E\0"); - //replaceAll(context,"†","†"); + //replaceAll(context,"†","???"); replaceAll(context, "†", "\xE2\x80\xA0\0"); - //replaceAll(context,"‡","‡"); + //replaceAll(context,"‡","???"); replaceAll(context, "‡", "\xE2\x80\xA1\0"); - //replaceAll(context,"‰","‰"); + //replaceAll(context,"‰","???"); replaceAll(context, "‰", "\xE2\x80\xB0\0"); - //replaceAll(context,"‹","‹"); + //replaceAll(context,"‹","???"); replaceAll(context, "‹", "\xE2\x80\xB9\0"); - //replaceAll(context,"›","›"); + //replaceAll(context,"›","???"); replaceAll(context, "›", "\xE2\x80\xBA\0"); - //replaceAll(context,"€","€"); + //replaceAll(context,"€","???"); replaceAll(context, "€", "\xE2\x82\xAC\0"); return context; diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp index db9bcfa81..51f9dde8c 100644 --- a/source/shared_lib/sources/platform/common/simple_threads.cpp +++ b/source/shared_lib/sources/platform/common/simple_threads.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -127,14 +127,14 @@ namespace Shared { vector techPaths; findDirs(techDataPaths, techPaths); if (techPaths.empty() == false) { - // Always calc zetapack first so its up to date sooner - const string zetapackTechtreeName = "zetapack"; - vector::iterator iterFindZetaPack = std::find(techPaths.begin(), techPaths.end(), zetapackTechtreeName); - if (iterFindZetaPack != techPaths.end()) { - techPaths.erase(iterFindZetaPack); - techPaths.insert(techPaths.begin(), zetapackTechtreeName); + // Always calc factionpack first so its up to date sooner + const string factionpackTechtreeName = "factionpack"; + vector::iterator iterFindFactionPack = std::find(techPaths.begin(), techPaths.end(), factionpackTechtreeName); + if (iterFindFactionPack != techPaths.end()) { + techPaths.erase(iterFindFactionPack); + techPaths.insert(techPaths.begin(), factionpackTechtreeName); - if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] Found zetapack techtree and placing it at the TOP of the list\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__); + if (SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] Found factionpack techtree and placing it at the TOP of the list\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__); } unsigned int techsPerWorker = ((unsigned int) techPaths.size() / (unsigned int) MAX_FileCRCPreCacheThread_WORKER_THREADS); if (techPaths.size() % MAX_FileCRCPreCacheThread_WORKER_THREADS != 0) { diff --git a/source/shared_lib/sources/platform/posix/miniftpclient.cpp b/source/shared_lib/sources/platform/posix/miniftpclient.cpp index 430ebb5c6..f6ad6b5d1 100644 --- a/source/shared_lib/sources/platform/posix/miniftpclient.cpp +++ b/source/shared_lib/sources/platform/posix/miniftpclient.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -294,8 +294,8 @@ namespace Shared { destFile += mapFileName.first; if (mapFileName.second == "") { - if (EndsWith(destFile, ".zgm") == false && EndsWith(destFile, ".mgm") == false && EndsWith(destFile, ".gbm") == false) { - destFileExt = ".zgm"; + if (EndsWith(destFile, ".mgm") == false && EndsWith(destFile, ".gbm") == false) { + destFileExt = ".mgm"; destFile += destFileExt; } } @@ -380,7 +380,7 @@ namespace Shared { result = getMapFromServer(mapFileName, "", ""); } else { pair findMapFileName = mapFileName; - findMapFileName.first += +".zgm"; + findMapFileName.first += +".mgm"; result = getMapFromServer(findMapFileName, FTP_MAPS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD); if (result.first == ftp_crt_FAIL && this->getQuitStatus() == false) { @@ -389,7 +389,7 @@ namespace Shared { result = getMapFromServer(findMapFileName, FTP_MAPS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD); if (result.first == ftp_crt_FAIL && this->getQuitStatus() == false) { findMapFileName = mapFileName; - findMapFileName.first += +".zgm"; + findMapFileName.first += +".mgm"; result = getMapFromServer(findMapFileName, FTP_MAPS_USERNAME, FTP_COMMON_PASSWORD); if (result.first == ftp_crt_FAIL && this->getQuitStatus() == false) { findMapFileName = mapFileName; diff --git a/source/shared_lib/sources/platform/posix/miniftpserver.cpp b/source/shared_lib/sources/platform/posix/miniftpserver.cpp index 23cb61207..0f1e1e846 100644 --- a/source/shared_lib/sources/platform/posix/miniftpserver.cpp +++ b/source/shared_lib/sources/platform/posix/miniftpserver.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp index 3a316e39d..5861a6f4c 100644 --- a/source/shared_lib/sources/platform/posix/socket.cpp +++ b/source/shared_lib/sources/platform/posix/socket.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -2785,12 +2785,12 @@ namespace Shared { //int r = 0; #ifndef MINIUPNPC_VERSION_PRE1_5 #ifndef MINIUPNPC_VERSION_PRE1_6 - int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "ZetaGlest - zetaglest.github.io", "TCP", 0, NULL); + int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "Glest - glest.github.io", "TCP", 0, NULL); #else - int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "ZetaGlest - zetaglest.github.io", "TCP", 0); + int r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, ext_port_str, int_port_str, lanaddr, "Glest - glest.github.io", "TCP", 0); #endif #else - int r = UPNP_AddPortMapping(urls.controlURL, data.servicetype, ext_port_str, int_port_str, lanaddr, "ZetaGlest - zetaglest.github.io", "TCP", 0); + int r = UPNP_AddPortMapping(urls.controlURL, data.servicetype, ext_port_str, int_port_str, lanaddr, "Glest - glest.github.io", "TCP", 0); #endif if (r != UPNPCOMMAND_SUCCESS) { if (SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork, "In [%s::%s Line: %d] AddPortMapping(%s, %s, %s) failed\n", __FILE__, __FUNCTION__, __LINE__, ext_port_str, int_port_str, lanaddr); diff --git a/source/shared_lib/sources/platform/sdl/factory_repository.cpp b/source/shared_lib/sources/platform/sdl/factory_repository.cpp index 1ba5f9fa3..53514507a 100644 --- a/source/shared_lib/sources/platform/sdl/factory_repository.cpp +++ b/source/shared_lib/sources/platform/sdl/factory_repository.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp index 3de2c02f7..8595377b9 100644 --- a/source/shared_lib/sources/platform/sdl/gl_wrap.cpp +++ b/source/shared_lib/sources/platform/sdl/gl_wrap.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -130,7 +130,7 @@ namespace Shared { int windowX = SDL_WINDOWPOS_UNDEFINED; int windowY = SDL_WINDOWPOS_UNDEFINED; - string windowTitleText = "ZetaGlest"; + string windowTitleText = "Glest"; int windowDisplayID = -1; if (window != NULL) { @@ -229,22 +229,22 @@ namespace Shared { #ifndef WIN32 string icon_file = ""; #if defined(DATADIR) - if (fileExists(formatPath(TOSTRING(DATADIR)) + "zetaglest.png")) { - icon_file = formatPath(TOSTRING(DATADIR)) + "zetaglest.png"; - } else if (fileExists(formatPath(TOSTRING(DATADIR)) + "zetaglest.bmp")) { - icon_file = formatPath(TOSTRING(DATADIR)) + "zetaglest.bmp"; + if (fileExists(formatPath(TOSTRING(DATADIR)) + "glest.png")) { + icon_file = formatPath(TOSTRING(DATADIR)) + "glest.png"; + } else if (fileExists(formatPath(TOSTRING(DATADIR)) + "glest.bmp")) { + icon_file = formatPath(TOSTRING(DATADIR)) + "glest.bmp"; } #endif - if (icon_file == "" && fileExists("zetaglest.png")) { - icon_file = "zetaglest.png"; - } else if (icon_file == "" && fileExists("zetaglest.bmp")) { - icon_file = "zetaglest.bmp"; - } else if (icon_file == "" && fileExists("/usr/share/pixmaps/zetaglest.png")) { - icon_file = "/usr/share/pixmaps/zetaglest.png"; - } else if (icon_file == "" && fileExists("/usr/share/pixmaps/zetaglest.bmp")) { - icon_file = "/usr/share/pixmaps/zetaglest.bmp"; + if (icon_file == "" && fileExists("glest.png")) { + icon_file = "glest.png"; + } else if (icon_file == "" && fileExists("glest.bmp")) { + icon_file = "glest.bmp"; + } else if (icon_file == "" && fileExists("/usr/share/pixmaps/glest.png")) { + icon_file = "/usr/share/pixmaps/glest.png"; + } else if (icon_file == "" && fileExists("/usr/share/pixmaps/glest.bmp")) { + icon_file = "/usr/share/pixmaps/glest.bmp"; } if (icon_file != "") { @@ -267,7 +267,7 @@ namespace Shared { delete[] result.second; } - //SDL_Surface *icon = IMG_Load("zetaglest.ico"); + //SDL_Surface *icon = IMG_Load("glest.ico"); //#if !defined(MACOSX) diff --git a/source/shared_lib/sources/platform/sdl/platform_util.cpp b/source/shared_lib/sources/platform/sdl/platform_util.cpp index f3be35503..0c895bceb 100644 --- a/source/shared_lib/sources/platform/sdl/platform_util.cpp +++ b/source/shared_lib/sources/platform/sdl/platform_util.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/sdl/thread.cpp b/source/shared_lib/sources/platform/sdl/thread.cpp index f6e588451..ab3727a2a 100644 --- a/source/shared_lib/sources/platform/sdl/thread.cpp +++ b/source/shared_lib/sources/platform/sdl/thread.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/sdl/window.cpp b/source/shared_lib/sources/platform/sdl/window.cpp index ef144f565..882cff0ca 100644 --- a/source/shared_lib/sources/platform/sdl/window.cpp +++ b/source/shared_lib/sources/platform/sdl/window.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/sdl/window_gl.cpp b/source/shared_lib/sources/platform/sdl/window_gl.cpp index 0b79b8f2e..569d43554 100644 --- a/source/shared_lib/sources/platform/sdl/window_gl.cpp +++ b/source/shared_lib/sources/platform/sdl/window_gl.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp b/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp index 50dd4f1ad..499248edd 100644 --- a/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp +++ b/source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/win32/win32_factory_repository.cpp b/source/shared_lib/sources/platform/win32/win32_factory_repository.cpp index 4dcce0840..bb098cb9e 100644 --- a/source/shared_lib/sources/platform/win32/win32_factory_repository.cpp +++ b/source/shared_lib/sources/platform/win32/win32_factory_repository.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/platform/win32/win32_platform_util.cpp b/source/shared_lib/sources/platform/win32/win32_platform_util.cpp index fd8f21ee2..8a8bb38a1 100644 --- a/source/shared_lib/sources/platform/win32/win32_platform_util.cpp +++ b/source/shared_lib/sources/platform/win32/win32_platform_util.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/sound/openal/sound_player_openal.cpp b/source/shared_lib/sources/sound/openal/sound_player_openal.cpp index 7e55725a3..08240a742 100644 --- a/source/shared_lib/sources/sound/openal/sound_player_openal.cpp +++ b/source/shared_lib/sources/sound/openal/sound_player_openal.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/sound/sound.cpp b/source/shared_lib/sources/sound/sound.cpp index 2f44b22f7..205d1c238 100644 --- a/source/shared_lib/sources/sound/sound.cpp +++ b/source/shared_lib/sources/sound/sound.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/sound/sound_file_loader.cpp b/source/shared_lib/sources/sound/sound_file_loader.cpp index 63ff97bc0..298957753 100644 --- a/source/shared_lib/sources/sound/sound_file_loader.cpp +++ b/source/shared_lib/sources/sound/sound_file_loader.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/sound/sound_interface.cpp b/source/shared_lib/sources/sound/sound_interface.cpp index 412e4d654..8f7c70f2e 100644 --- a/source/shared_lib/sources/sound/sound_interface.cpp +++ b/source/shared_lib/sources/sound/sound_interface.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/sound/sound_player.cpp b/source/shared_lib/sources/sound/sound_player.cpp index 11a5f1a01..a4404b7c8 100644 --- a/source/shared_lib/sources/sound/sound_player.cpp +++ b/source/shared_lib/sources/sound/sound_player.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/streflop/FPUSettings.asm b/source/shared_lib/sources/streflop/FPUSettings.asm index 78dd1d94e..7d83fc04d 100644 --- a/source/shared_lib/sources/streflop/FPUSettings.asm +++ b/source/shared_lib/sources/streflop/FPUSettings.asm @@ -1,5 +1,5 @@ ; -; Copyright (c) 2014 MegaGlest. All Rights Reserved. +; Copyright (c) 2014 Glest. All Rights Reserved. ; ; Use of this source code is governed by the GPL 3.x license diff --git a/source/shared_lib/sources/util/checksum.cpp b/source/shared_lib/sources/util/checksum.cpp index 8bda53f06..be15e3333 100644 --- a/source/shared_lib/sources/util/checksum.cpp +++ b/source/shared_lib/sources/util/checksum.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/util/conversion.cpp b/source/shared_lib/sources/util/conversion.cpp index 0524bdb47..8537deeca 100644 --- a/source/shared_lib/sources/util/conversion.cpp +++ b/source/shared_lib/sources/util/conversion.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/util/leak_dumper.cpp b/source/shared_lib/sources/util/leak_dumper.cpp index 1d323b557..5927c0cf1 100644 --- a/source/shared_lib/sources/util/leak_dumper.cpp +++ b/source/shared_lib/sources/util/leak_dumper.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/util/profiler.cpp b/source/shared_lib/sources/util/profiler.cpp index de45f6eb2..202cfdc5e 100644 --- a/source/shared_lib/sources/util/profiler.cpp +++ b/source/shared_lib/sources/util/profiler.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/util/properties.cpp b/source/shared_lib/sources/util/properties.cpp index 0eae5ce6c..6a3cd50d7 100644 --- a/source/shared_lib/sources/util/properties.cpp +++ b/source/shared_lib/sources/util/properties.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/util/randomgen.cpp b/source/shared_lib/sources/util/randomgen.cpp index 7913d6e24..8b5a2fced 100644 --- a/source/shared_lib/sources/util/randomgen.cpp +++ b/source/shared_lib/sources/util/randomgen.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp index 4067bedc4..5e923817c 100644 --- a/source/shared_lib/sources/util/util.cpp +++ b/source/shared_lib/sources/util/util.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -141,7 +141,7 @@ namespace Shared { /* some servers don't like requests that are made without a user-agent field, so we provide one */ - curl_easy_setopt(handle, CURLOPT_USERAGENT, "zetaglest-agent/1.0"); + curl_easy_setopt(handle, CURLOPT_USERAGENT, "glest-agent/1.0"); /* follow HTTP redirects (status 3xx), 20 at most */ curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1); @@ -572,7 +572,7 @@ namespace Shared { if (currentDebugLog.fileStream->is_open() == true) { MutexSafeWrapper safeMutex(currentDebugLog.mutex, string(extractFileFromDirectoryPath(__FILE__).c_str()) + "_" + intToStr(__LINE__)); - (*currentDebugLog.fileStream) << "Starting ZetaGlest logging for type: " << type << "\n"; + (*currentDebugLog.fileStream) << "Starting Glest logging for type: " << type << "\n"; (*currentDebugLog.fileStream).flush(); safeMutex.ReleaseLock(); diff --git a/source/shared_lib/sources/xml/xml_parser.cpp b/source/shared_lib/sources/xml/xml_parser.cpp index 44659d40d..9ec5ebad3 100644 --- a/source/shared_lib/sources/xml/xml_parser.cpp +++ b/source/shared_lib/sources/xml/xml_parser.cpp @@ -1,8 +1,8 @@ -// This file is part of ZetaGlest +// This file is part of Glest // -// Copyright (C) 2018 The ZetaGlest team +// Copyright (C) 2018 The Glest team // -// ZetaGlest is a fork of MegaGlest +// Glest is a fork of MegaGlest // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/source/steamshim_parent/.gitignore b/source/steamshim_parent/.gitignore index dfdd9dfef..94ab5acc9 100644 --- a/source/steamshim_parent/.gitignore +++ b/source/steamshim_parent/.gitignore @@ -1 +1 @@ -megaglest_shim +glest_shim diff --git a/source/steamshim_parent/Makefile b/source/steamshim_parent/Makefile index 8b97586b6..96431a5b4 100644 --- a/source/steamshim_parent/Makefile +++ b/source/steamshim_parent/Makefile @@ -1,5 +1,5 @@ -TARGET := megaglest_shim -GAME_LAUNCH_NAME ?= megaglest +TARGET := glest_shim +GAME_LAUNCH_NAME ?= glest ifndef STEAMWORKS # STEAMWORKS ?= /home/softcoder/Code/steamworks_sdk/sdk diff --git a/source/steamshim_parent/Makefile.win b/source/steamshim_parent/Makefile.win index 07ebfd032..abe8bcb3f 100644 --- a/source/steamshim_parent/Makefile.win +++ b/source/steamshim_parent/Makefile.win @@ -1,5 +1,5 @@ -TARGET = megaglest_shim -GAME_LAUNCH_NAME = megaglest +TARGET = glest_shim +GAME_LAUNCH_NAME = glest !ifndef STEAMWORKS # STEAMWORKS = ..\..\..\steamworks_sdk\sdk diff --git a/source/steamshim_parent/build.bat b/source/steamshim_parent/build.bat index 98d336cee..95e403650 100644 --- a/source/steamshim_parent/build.bat +++ b/source/steamshim_parent/build.bat @@ -50,11 +50,11 @@ ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] rem Build Mega-Glest in release mode ECHO -------------------------------- -Echo Building MegaGlest using Visual Studio 2015... +Echo Building Glest using Visual Studio 2015... set CL=/MP IF EXIST "steamshim_parent.obj" del steamshim_parent.obj -IF EXIST "megaglest_shim.exe" del megaglest_shim.exe +IF EXIST "glest_shim.exe" del glest_shim.exe rem set VisualStudioVersion=11.0 set msBuildMaxCPU= @@ -70,7 +70,7 @@ SET MSBUILD_PATH_MG_x64="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V140\\" echo Doing a FULL REBUILD... nmake /f Makefile.win STEAMWORKS=%STEAMWORKS% -SET STEAM_MG_PATH=C:\Program Files (x86)\Steam\steamapps\common\MegaGlest\ +SET STEAM_MG_PATH=C:\Program Files (x86)\Steam\steamapps\common\Glest\ if EXIST "%STEAM_MG_PATH%" goto COPY_TO_STEAM goto end_script @@ -79,7 +79,7 @@ if NOT EXIST "%STEAM_MG_PATH%\steam_appid.txt" goto COPY_TO_STEAM_APPID goto COPY_TO_STEAM_DLL :COPY_TO_STEAM_APPID -echo "Installing steam appid file to Megaglest Steam folder [%STEAM_MG_PATH%] ..." +echo "Installing steam appid file to Glest Steam folder [%STEAM_MG_PATH%] ..." copy steam_appid.txt "%STEAM_MG_PATH%" :COPY_TO_STEAM_DLL @@ -88,12 +88,12 @@ if NOT EXIST "%STEAM_MG_PATH%\steam_api.dll" goto COPY_TO_STEAM_DLL_START goto COPY_TO_STEAM_SHIM :COPY_TO_STEAM_DLL_START -echo "Installing steam sdk api to Megaglest Steam folder [%STEAM_MG_PATH%] ..." +echo "Installing steam sdk api to Glest Steam folder [%STEAM_MG_PATH%] ..." copy "%STEAMWORKS%\redistributable_bin\steam_api.dll" "%STEAM_MG_PATH%" :COPY_TO_STEAM_SHIM -echo "Installing steam shim to Megaglest Steam folder [%STEAM_MG_PATH%] ..." -copy megaglest_shim.exe "%STEAM_MG_PATH%" +echo "Installing steam shim to Glest Steam folder [%STEAM_MG_PATH%] ..." +copy glest_shim.exe "%STEAM_MG_PATH%" ECHO ... End. diff --git a/source/steamshim_parent/build.sh b/source/steamshim_parent/build.sh index 83d70d978..75ced74be 100755 --- a/source/steamshim_parent/build.sh +++ b/source/steamshim_parent/build.sh @@ -1,13 +1,13 @@ #!/bin/bash -# Use this script to build MegaGlest Steam Shim using make +# Use this script to build Glest Steam Shim using make # ---------------------------------------------------------------------------- # Written by Mark Vejvoda # Copyright (c) 2011-2017 Mark Vejvoda under GNU GPL v3.0+ # ---------------------------------------------------------------------------- CURRENTDIR="$(dirname $(readlink -f $0))" -rm -f ${CURRENTDIR}/megaglest_shim -rm -f ${CURRENTDIR}/megaglest +rm -f ${CURRENTDIR}/glest_shim +rm -f ${CURRENTDIR}/glest # Pass the path to your steam SDK example: # builds.sh STEAMWORKS?=/home/softcoder/Code/steamworks_sdk/sdk # @@ -17,10 +17,10 @@ if [ $? -ne 0 ]; then echo 'ERROR: MAKE failed.' >&2; exit 2 fi -STEAM_MG_PATH="$HOME/.steam/steam/steamapps/common/MegaGlest/" +STEAM_MG_PATH="$HOME/.steam/steam/steamapps/common/Glest/" if [ -d ${STEAM_MG_PATH} ]; then if [ ! -f "${STEAM_MG_PATH}/steam_appid.txt" ]; then - echo "Installing steam appid file to Megaglest Steam folder [${STEAM_MG_PATH}] ..." + echo "Installing steam appid file to Glest Steam folder [${STEAM_MG_PATH}] ..." cp ${CURRENTDIR}/steam_appid.txt ${STEAM_MG_PATH}/steam_appid.txt fi @@ -29,10 +29,10 @@ if [ -d ${STEAM_MG_PATH} ]; then STEAMWORKS=${PARAM1#$prefix} # echo "${STEAMWORKS}" if [ ! -f "${STEAM_MG_PATH}/lib/libsteam_api.so" ]; then - echo "Installing steam sdk api to Megaglest Steam folder [${STEAM_MG_PATH}/lib/] ..." + echo "Installing steam sdk api to Glest Steam folder [${STEAM_MG_PATH}/lib/] ..." cp ${STEAMWORKS}/redistributable_bin/linux64/libsteam_api.so ${STEAM_MG_PATH}/lib/libsteam_api.so fi - echo "Installing steam shim to Megaglest Steam folder [${STEAM_MG_PATH}] ..." - cp ${CURRENTDIR}/megaglest_shim ${STEAM_MG_PATH}/megaglest_shim + echo "Installing steam shim to Glest Steam folder [${STEAM_MG_PATH}] ..." + cp ${CURRENTDIR}/glest_shim ${STEAM_MG_PATH}/glest_shim fi diff --git a/source/steamshim_parent/steamshim_parent.cpp b/source/steamshim_parent/steamshim_parent.cpp index b4c9072b4..968444287 100644 --- a/source/steamshim_parent/steamshim_parent.cpp +++ b/source/steamshim_parent/steamshim_parent.cpp @@ -1,5 +1,5 @@ #ifndef GAME_LAUNCH_NAME -#define GAME_LAUNCH_NAME "megaglest" +#define GAME_LAUNCH_NAME "glest" #endif #ifdef _WIN32 @@ -306,7 +306,7 @@ static int closeProcess(ProcessType *pid) int main(int argc, char **argv) { - printf("#1 =============> Megaglest Parent starting mainline.\n"); + printf("#1 =============> Glest Parent starting mainline.\n"); signal(SIGPIPE, SIG_IGN); GArgc = argc; @@ -771,10 +771,10 @@ static int mainline(void) PipeType pipeChildWrite = NULLPIPE; ProcessType childPid; - printf("#2 =============> Megaglest Parent starting mainline.\n"); + printf("#2 =============> Glest Parent starting mainline.\n"); #ifdef STEAMSHIM_DEBUG - printf("=============> Megaglest Parent starting mainline.\n"); + printf("=============> Glest Parent starting mainline.\n"); #endif dbgpipe("Parent starting mainline.\n"); diff --git a/source/tools/merge_new_language_vars/merge_new_language_vars.pl b/source/tools/merge_new_language_vars/merge_new_language_vars.pl index c3bbb9f8d..70d67393c 100755 --- a/source/tools/merge_new_language_vars/merge_new_language_vars.pl +++ b/source/tools/merge_new_language_vars/merge_new_language_vars.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# utility for zetaglest, probably works for glest and GAE too +# utility for glest, probably works for glest and GAE too # merge new language variables from the main language (english) to all other language files # Copyright 2011 olaus, 20101222 # license: GPL v3 diff --git a/source/tools/support/linux/system_report b/source/tools/support/linux/system_report index 174b6de2d..73b2d20ff 100755 --- a/source/tools/support/linux/system_report +++ b/source/tools/support/linux/system_report @@ -1,14 +1,14 @@ #!/bin/sh # -# MegaGlest System Report +# Glest System Report # -# Examines the Linux operating environment of a MegaGlest installation and +# Examines the Linux operating environment of a Glest installation and # dumps this information into REPORT_LOCATION for support purposes. # # ----------------------------------------------------------------------------- # -# Written by Tom Reynolds -# Copyright (c) 2012-2017 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0 +# Written by Tom Reynolds +# Copyright (c) 2012-2017 Tom Reynolds, The Glest Team, under GNU GPL v3.0 # # ----------------------------------------------------------------------------- # @@ -17,7 +17,7 @@ # Location to write report to #REPORT_LOCATION= -# MegaGlest installation directory, see --help +# Glest installation directory, see --help #INSTALLATION_LOCATION= # Make user press Enter to exit @@ -33,10 +33,10 @@ VERSION='0.3.5' MYNAME="$(basename "$0")" DEFAULT_REPORT_FILENAME="system_report.log" KERNEL="$(uname -s | tr '[A-Z]' '[a-z]')" -if [ "$KERNEL" = "darwin" ]; then Exec_1="MegaGlest.sh"; Exec_2="MegaGlest" - Default_location="/Applications/MegaGlest.app/Contents/MacOS" -else Exec_1="start_megaglest"; Exec_2="megaglest" - Default_location=~/"megaglest" +if [ "$KERNEL" = "darwin" ]; then Exec_1="Glest.sh"; Exec_2="Glest" + Default_location="/Applications/Glest.app/Contents/MacOS" +else Exec_1="start_glest"; Exec_2="glest" + Default_location=~/"glest" fi if [ "$KERNEL" = "linux" ] || [ "$(echo "$(readlink -f "$0" >/dev/null 2>&1; echo $?)" | grep '^[0-9]$')" -eq "0" ]; then SCRIPTDIR="$(dirname "$(readlink -f "$0")")" @@ -44,7 +44,7 @@ else SCRIPTDIR="$(cd "$(dirname "$0")"; pwd)" fi if [ "$1" = "-v" ] || [ "$1" = "--version" ]; then - echo "MegaGlest System Report $VERSION"; echo; exit 0; fi + echo "Glest System Report $VERSION"; echo; exit 0; fi if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then echo "Usage:" @@ -55,7 +55,7 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then echo " --version output version information and exit" echo " --help display this help and exit" echo - echo "INSTALLATION LOCATION is an optional argument which specifies the MegaGlest" + echo "INSTALLATION LOCATION is an optional argument which specifies the Glest" echo "installation directory, containing the '$Exec_2' wrapper script." echo; exit 0 fi @@ -76,7 +76,7 @@ common_info () { echo >&2 echo "Please specify the directory you installed to (which must contain the" >&2 echo "'$Exec_2' file) as first parameter to this script, e.g.:" >&2 - echo " $MYNAME /home/user/MegaGlest-3" >&2 + echo " $MYNAME /home/user/Glest-3" >&2 echo >&2 echo "You may try to use the following commands to locate it:" >&2 echo " locate -b $Exec_2" >&2 @@ -84,8 +84,8 @@ common_info () { echo " sudo find -type f -name $Exec_2 /" >&2 echo >&2 echo "Please be aware that this script is written to work with installations created" >&2 - echo "using the installation instructions on http://megaglest.org. It may or may not" >&2 - echo "work with variants of MegaGlest which were packaged by your Linux distribution." >&2 + echo "using the installation instructions on http://glest.org. It may or may not" >&2 + echo "work with variants of Glest which were packaged by your Linux distribution." >&2 echo >&2; exit 1 } if ( [ "$INSTALLATION_LOCATION_TYPE" = "def" ] || [ "$INSTALLATION_LOCATION_TYPE" = "def2" ] ) && \ @@ -94,7 +94,7 @@ if ( [ "$INSTALLATION_LOCATION_TYPE" = "def" ] || [ "$INSTALLATION_LOCATION_TYPE echo " This is usually what you want. To manually specify it, see --help." >&2 elif ( [ "$INSTALLATION_LOCATION_TYPE" = "def" ] && [ "$Executable" = "" ] ) || \ [ "$INSTALLATION_LOCATION" = "" ]; then - echo "ERROR: Unable to determine MegaGlest installation location." >&2 + echo "ERROR: Unable to determine Glest installation location." >&2 echo >&2 common_info elif ( [ "$INSTALLATION_LOCATION_TYPE" = "var" ] || [ "$INSTALLATION_LOCATION_TYPE" = "arg" ] ) && \ @@ -184,14 +184,14 @@ echo ' v'"$VERSION"'' echo '' echo '________________________________________________________________________________' echo '' -echo ' Collecting information on this computer and MegaGlest.' +echo ' Collecting information on this computer and Glest.' echo '' echo ' Please stand by...' echo '________________________________________________________________________________' echo '' echo '' echo '--------------------------------------------------------------------------------' >> $REPORT_LOCATION -echo ' MEGAGLEST SYSTEM REPORT '"$VERSION" >> $REPORT_LOCATION +echo ' GLEST SYSTEM REPORT '"$VERSION" >> $REPORT_LOCATION echo ' '"`date -Ru`" >> $REPORT_LOCATION echo '--------------------------------------------------------------------------------' >> $REPORT_LOCATION @@ -240,27 +240,27 @@ echo '>>> cat /etc/issue' >> $REPORT_LOCATION cat /etc/issue >> $REPORT_LOCATION 2>&1 sleep 1 -echo ' → MegaGlest version' +echo ' → Glest version' el_in_report 2 -echo '***** MegaGlest version ********************************************************' >> $REPORT_LOCATION +echo '***** Glest version ********************************************************' >> $REPORT_LOCATION el_in_report echo ">>> INSTALLATION_LOCATION ($INSTALLATION_LOCATION_TYPE): [$INSTALLATION_LOCATION/]." >> $REPORT_LOCATION -ERROR_RUNNING_MEGAGLEST=0 +ERROR_RUNNING_GLEST=0 MG_error_check () { - if [ "$1" -eq "0" ]; then ERROR_RUNNING_MEGAGLEST=0 - else ERROR_RUNNING_MEGAGLEST=1; fi + if [ "$1" -eq "0" ]; then ERROR_RUNNING_GLEST=0 + else ERROR_RUNNING_GLEST=1; fi sleep 1 } -if [ "$ERROR_RUNNING_MEGAGLEST" -eq "0" ]; then - echo ' (MegaGlest will be launched, but should quit automatically.)' +if [ "$ERROR_RUNNING_GLEST" -eq "0" ]; then + echo ' (Glest will be launched, but should quit automatically.)' el_in_report echo ">>> ./$Executable --use-language=en --version" >> $REPORT_LOCATION "$INSTALLATION_LOCATION/$Executable" --use-language=en --version >> $REPORT_LOCATION 2>&1 MG_error_check "$?" else - echo 'WARNING: A previous run of MegaGlest failed. Skipping test.' >&2 + echo 'WARNING: A previous run of Glest failed. Skipping test.' >&2 echo ">>> SKIPPED: ./$Executable --use-language=en --version" >> $REPORT_LOCATION fi @@ -292,18 +292,18 @@ else fi sleep 1 -echo ' → MegaGlest configuration' +echo ' → Glest configuration' el_in_report 2 -echo '***** MegaGlest configuration **************************************************' >> $REPORT_LOCATION +echo '***** Glest configuration **************************************************' >> $REPORT_LOCATION el_in_report -if [ "$ERROR_RUNNING_MEGAGLEST" -eq "0" ]; then - echo ' (MegaGlest will be launched, but should quit automatically.)' +if [ "$ERROR_RUNNING_GLEST" -eq "0" ]; then + echo ' (Glest will be launched, but should quit automatically.)' echo ">>> ./$Executable --use-language=en --show-ini-settings" >> $REPORT_LOCATION "$INSTALLATION_LOCATION/$Executable" --use-language=en --show-ini-settings >> $REPORT_LOCATION 2>&1 MG_error_check "$?" else - echo 'WARNING: A previous run of MegaGlest failed. Skipping test.' + echo 'WARNING: A previous run of Glest failed. Skipping test.' echo ">>> SKIPPED: ./$Executable --use-language=en --show-ini-settings" >> $REPORT_LOCATION fi @@ -343,14 +343,14 @@ fi sleep 1 el_in_report echo '----------------------------------------' >> $REPORT_LOCATION -if [ "$ERROR_RUNNING_MEGAGLEST" -eq "0" ]; then - echo ' (MegaGlest will be launched, but should quit automatically.)' +if [ "$ERROR_RUNNING_GLEST" -eq "0" ]; then + echo ' (Glest will be launched, but should quit automatically.)' el_in_report echo ">>> ./$Executable --use-language=en --opengl-info" >> $REPORT_LOCATION "$INSTALLATION_LOCATION/$Executable" --use-language=en --opengl-info >> $REPORT_LOCATION 2>&1 MG_error_check "$?" else - echo 'WARNING: A previous run of MegaGlest failed. Skipping test.' >&2 + echo 'WARNING: A previous run of Glest failed. Skipping test.' >&2 echo ">>> SKIPPED: ./$Executable --use-language=en --opengl-info" >> $REPORT_LOCATION fi el_in_report @@ -378,19 +378,19 @@ echo ' Please find your report in this file:' echo ' '"$REPORT_LOCATION" echo '' echo ' Please post this report to a pastebin such as (one of)' -echo ' http://paste.megaglest.org' +echo ' http://paste.glest.org' echo ' http://pastebin.com' echo '' echo ' After posting it there you will be taken to a new Internet address. Please' echo ' take note of this new location/URL/Internet address and make it available to' -echo ' the MegaGlest developers. Unless you were instructed to do otherwise, please' +echo ' the Glest developers. Unless you were instructed to do otherwise, please' echo ' post both the Internet address of where you uploaded to and a verbose' echo ' description of the issues you are experiencing at' -echo ' http://forum.megaglest.org' +echo ' http://forum.glest.org' echo '' echo ' Thank you for making it easy for us to assist you,' echo '' -echo ' -- The MegaGlest development team' +echo ' -- The Glest development team' if [ "$PAUSE" -eq "1" ] || [ "$PAUSE" = "true" ]; then echo '________________________________________________________________________________'