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

Renamed ZetaGlest to Glest

Browse Source
This commit is contained in:
mathusummut
2019-01-31 02:40:31 +01:00
parent 94493ab109
commit d5775734d7
536 changed files with 2372 additions and 2411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -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

6
.travis-before_install.sh
View File

@@ -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 <https://github.com/ZetaGlest>
# ZetaGlest Team
# modified for Glest <https://github.com/Glest>
# Glest Team
# This only needs to be changed when Travis updates the Ubuntu version
# it's using.

4
.travis.yml
View File

@@ -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

14
AUTHORS.md
View File

@@ -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

58
BUILD.md
View File

@@ -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.
<!-- This needs to be duplicated in the BUILD.md and INSTALL.md doc -->
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.
<!-- end duplication -->

26
CMakeLists.txt
View File

@@ -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} )

44
CONTRIBUTING.md
View File

@@ -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**).

70
ChangeLog.md
View File

@@ -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:
```<?xml version="1.0" standalone="no"?><unit><link tech-tree="zetapack" faction="persian"/></unit>```
```<?xml version="1.0" standalone="no"?><unit><link tech-tree="factionpack" faction="persian"/></unit>```
- 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
- <target-height> <burn-height> can be given https://docs.megaglest.org/XML/Unit#target-height
- <target-height> <burn-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 )

23
INSTALL.md
View File

@@ -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=<absolute-path-to-data>`
(data packages will be created soon -andy5995 2018-09-16)
#### Uninstalling
Makefiles generated with cmake do not have an 'uninstall' option. There

0
COPYING → LICENSE
View File

50
README.md
View File

@@ -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

26
WEBSITE_DESIGN.md
View File

@@ -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

68
man/zetaglest.6 → man/glest.6
View File

@@ -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

12
man/glest_editor.6 Normal file
View File

@@ -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.

34
man/zetaglest_g3dviewer.6 → man/glest_g3dviewer.6
View File

@@ -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\-<filename>, 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

12
man/zetaglest_editor.6
View File

@@ -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.

6
mk/cmake/Modules/ReqVersAndStaticConf.cmake
View File

@@ -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)

10
mk/linux/.gitignore vendored
View File

@@ -1,8 +1,8 @@
/zetaglest
/zetaglest.6
/zetaglest_editor*
/zetaglest_g3dviewer*
/zetaglest_tests
/glest
/glest.6
/glest_editor*
/glest_g3dviewer*
/glest_tests
!/*.desktop

8
mk/linux/build-deps.sh
View File

@@ -3,7 +3,7 @@
# Use this script to install build dependencies on a number of Linux platforms
# ----------------------------------------------------------------------------
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Rewritten by Tom Reynolds <tomreyn@megaglest.org>
# Rewritten by Tom Reynolds <tomreyn@glest.org>
# 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

10
mk/linux/build-zg-nodeps.sh → mk/linux/build-nodeps.sh Executable file → Normal file
View File

@@ -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 <mark_vejvoda@hotmail.com>
# 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

4
mk/linux/build-zg.sh → mk/linux/build.sh Executable file → Normal file
View File

@@ -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 <mark_vejvoda@hotmail.com>
# 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

2
mk/linux/clone-data.sh
View File

@@ -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

2
mk/linux/detect-system.sh
View File

@@ -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

4
mk/linux/setup.sh
View File

@@ -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

12
mk/linux/start_zetaglest_gameserver → mk/linux/start_glest_gameserver Executable file → Normal file
View File

@@ -22,7 +22,7 @@
# the next user who connects (or had already connected) takes control.
#
# ----------------------------------------------------------------------------
# 2013 Written by Tom Reynolds <tomreyn[at]zetaglest.org>
# 2013 Written by Tom Reynolds <tomreyn[at]glest.org>
# 2015 Rewritten by filux <heross(@@)o2.pl>
# 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

14
mk/linux/tools-for-standalone-client/start_zetaglest → mk/linux/tools-for-standalone-client/start_glest Executable file → Normal file
View File

@@ -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=""

4
mk/linux/tools-for-standalone-client/start_zetaglest_g3dviewer → mk/linux/tools-for-standalone-client/start_glest_g3dviewer Executable file → Normal file
View File

@@ -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)"

4
mk/linux/tools-for-standalone-client/start_zetaglest_mapeditor → mk/linux/tools-for-standalone-client/start_glest_mapeditor Executable file → Normal file
View File

@@ -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)"

6
mk/macos/.gitignore vendored
View File

@@ -1,6 +1,6 @@
/megaglest
/megaglest.6
/megaglest_*
/glest
/glest.6
/glest_*
/[Mm]ega[Gg]lest*.dmg
core

10
mk/macos/CMakeLists.txt
View File

@@ -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")

46
mk/macos/build-zg.sh → mk/macos/build.sh Executable file → Normal file
View File

@@ -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 <mark_vejvoda@hotmail.com>
# 2015 Rewritten by filux <heross(@@)o2.pl>
@@ -7,7 +7,7 @@
# ----------------------------------------------------------------------------
# Default to English language output so we can understand your bug reports
#
# Modified by Andy Alt for ZetaGlest <https://zetaglest.github.io/>
# Modified by Andy Alt for Glest <https://glest.github.io/>
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

0
mk/macos/bundle_resources/ZetaGlest.icns → mk/macos/bundle_resources/Glest.icns
View File

4
mk/macos/bundle_resources/ZetaGlest.sh → mk/macos/bundle_resources/Glest.sh
View File

@@ -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 "$?"

10
mk/macos/bundle_resources/Info.plist.in
View File

@@ -5,17 +5,17 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>ZetaGlest</string>
<string>Glest</string>
<key>CFBundleGetInfoString</key>
<string>v${ZETAGLEST_VERSION}, © 2018 The ZetaGlest Team.</string>
<string>v${GLEST_VERSION}, © 2018 The Glest Team.</string>
<key>CFBundleIconFile</key>
<string>ZetaGlest</string>
<string>Glest</string>
<key>CFBundleIdentifier</key>
<string>org.zetaglest.v${ZETAGLEST_VERSION}</string>
<string>org.glest.v${GLEST_VERSION}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>ZetaGlest</string>
<string>Glest</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>

BIN
mk/shared/glest.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 80 KiB

4
mk/shared/glest.ini
View File

@@ -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

BIN
mk/shared/zetaglest.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 113 KiB

2
mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.bat
View File

@@ -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

2
mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build.sh
View File

@@ -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

4
mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_editor.sh
View File

@@ -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

6
mk/steamworks_sdk/sdk/tools/ContentBuilder/run_build_win_editor.sh
View File

@@ -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

2
mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_linux_611990.vdf
View File

@@ -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

2
mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/editor_app_win_611990.vdf
View File

@@ -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

2
mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_linux_578870.vdf → mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_linux_578870.vdf
View File

@@ -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

2
mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/megaglest_build_windows_578870.vdf → mk/steamworks_sdk/sdk/tools/ContentBuilder/scripts/zetaglest_build_windows_578870.vdf
View File

@@ -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

20
mk/windows/README.md
View File

@@ -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:

2
mk/windows/build-zg+deps-2015-32.bat → mk/windows/build+deps-2015-32.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 32-bit using Visual Studio 2015...
SET VCVARS_PLATFORM=amd64_x86
SET FOLDER_NAME=vs2015-32
call .\build-zg.bat 2015-32 deps "%~1"
call .\build.bat 2015-32 deps "%~1"

2
mk/windows/build-zg+deps-2015-64.bat → mk/windows/build+deps-2015-64.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 64-bit using Visual Studio 2015...
SET VCVARS_PLATFORM=amd64
SET FOLDER_NAME=vs2015-64
call .\build-zg.bat 2015-64 deps "%~1"
call .\build.bat 2015-64 deps "%~1"

2
mk/windows/build-zg+deps-2017-32.bat → mk/windows/build+deps-2017-32.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 32-bit using Visual Studio 2017...
SET VCVARS_PLATFORM=amd64_x86
SET FOLDER_NAME=vs2017-32
call .\build-zg.bat 2017-32 deps "%~1"
call .\build.bat 2017-32 deps "%~1"

2
mk/windows/build-zg+deps-2017-64.bat → mk/windows/build+deps-2017-64.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 64-bit using Visual Studio 2017...
SET VCVARS_PLATFORM=amd64
SET FOLDER_NAME=vs2017-64
call .\build-zg.bat 2017-64 deps "%~1"
call .\build.bat 2017-64 deps "%~1"

2
mk/windows/build-zg-2015-32.bat → mk/windows/build-2015-32.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 32-bit using Visual Studio 2015...
SET VCVARS_PLATFORM=amd64_x86
SET FOLDER_NAME=vs2015-32
call .\build-zg.bat 2015-32 nodeps "%~1"
call .\build.bat 2015-32 nodeps "%~1"

2
mk/windows/build-zg-2015-64.bat → mk/windows/build-2015-64.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 64-bit using Visual Studio 2015...
SET VCVARS_PLATFORM=amd64
SET FOLDER_NAME=vs2015-64
call .\build-zg.bat 2015-64 nodeps "%~1"
call .\build.bat 2015-64 nodeps "%~1"

2
mk/windows/build-zg-2017-32.bat → mk/windows/build-2017-32.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 32-bit using Visual Studio 2017...
SET VCVARS_PLATFORM=amd64_x86
SET FOLDER_NAME=vs2017-32
call .\build-zg.bat 2017-32 nodeps "%~1"
call .\build.bat 2017-32 nodeps "%~1"

2
mk/windows/build-zg-2017-64.bat → mk/windows/build-2017-64.bat
View File

@@ -2,4 +2,4 @@
Echo Compiling for 64-bit using Visual Studio 2017...
SET VCVARS_PLATFORM=amd64
SET FOLDER_NAME=vs2017-64
call .\build-zg.bat 2017-64 nodeps "%~1"
call .\build.bat 2017-64 nodeps "%~1"

18
mk/windows/build-zg.bat → mk/windows/build.bat
View File

@@ -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

0
mk/windows/clean-zg.bat → mk/windows/clean.bat
View File

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

@@ -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

4
mk/windows/glest.ini
View File

@@ -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

1
mk/windows/glest.rc Normal file
View File

@@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "..\shared\glest.ico"

6
mk/windows/glest_release.ini
View File

@@ -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

8
mk/windows/group-binaries.bat
View File

@@ -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
copy /y vs2015-64\glest\glest.exe bin\vs2015\glest-64.exe
copy /y vs2017-64\glest\glest.exe bin\vs2017\glest-64.exe

8
mk/windows/prep-for-release-nodeps.bat
View File

@@ -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

8
mk/windows/prep-for-release.bat
View File

@@ -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

4
mk/windows/pull.bat
View File

@@ -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 ..\

2
mk/windows/setup.bat
View File

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

4
mk/windows/vs2015-32/ZetaGlest.sln → mk/windows/vs2015-32/Glest.sln
View File

@@ -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

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

@@ -106,7 +106,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -134,7 +134,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -160,7 +160,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -201,7 +201,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -250,13 +250,13 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\g3d_viewer\main.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\unit_particle_type.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

132
mk/windows/vs2015-32/zetaglest.vcxproj → mk/windows/vs2015-32/glest.vcxproj
View File

@@ -12,8 +12,8 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
<RootNamespace>zetaglest</RootNamespace>
<ProjectName>zetaglest</ProjectName>
<RootNamespace>glest</RootNamespace>
<ProjectName>glest</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -139,14 +139,14 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">glest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
@@ -178,7 +178,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -203,19 +203,19 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -224,7 +224,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -248,18 +248,18 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -268,7 +268,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -292,18 +292,18 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -315,7 +315,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -333,7 +333,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -367,7 +367,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -385,7 +385,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -418,7 +418,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -470,7 +470,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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\</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -521,7 +521,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -572,7 +572,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -623,7 +623,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -642,7 +642,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -674,7 +674,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -693,7 +693,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -717,42 +717,42 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\game\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\main\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\network\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\glest_game\types\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\world\*.cpp" />
<ClCompile Include="..\..\..\source\game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\game\game\*.cpp" />
<ClCompile Include="..\..\..\source\game\global\*.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\game\main\*.cpp" />
<ClCompile Include="..\..\..\source\game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\game\network\*.cpp" />
<ClCompile Include="..\..\..\source\game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\game\types\*.cpp" />
<ClCompile Include="..\..\..\source\game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\game\world\*.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_game\facilities\*.h" />
<ClInclude Include="..\..\..\source\glest_game\ai\*.h" />
<ClInclude Include="..\..\..\source\glest_game\game\*.h" />
<ClInclude Include="..\..\..\source\glest_game\global\*.h" />
<ClInclude Include="..\..\..\source\glest_game\graphics\*.h" />
<ClInclude Include="..\..\..\source\glest_game\gui\*.h" />
<ClInclude Include="..\..\..\source\glest_game\main\*.h" />
<ClInclude Include="..\..\..\source\glest_game\menu\*.h" />
<ClInclude Include="..\..\..\source\glest_game\network\*.h" />
<ClInclude Include="..\..\..\source\glest_game\sound\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steam\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\glest_game\types\*.h" />
<ClInclude Include="..\..\..\source\glest_game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\glest_game\world\*.h" />
<ClInclude Include="..\..\..\source\game\facilities\*.h" />
<ClInclude Include="..\..\..\source\game\ai\*.h" />
<ClInclude Include="..\..\..\source\game\game\*.h" />
<ClInclude Include="..\..\..\source\game\global\*.h" />
<ClInclude Include="..\..\..\source\game\graphics\*.h" />
<ClInclude Include="..\..\..\source\game\gui\*.h" />
<ClInclude Include="..\..\..\source\game\main\*.h" />
<ClInclude Include="..\..\..\source\game\menu\*.h" />
<ClInclude Include="..\..\..\source\game\network\*.h" />
<ClInclude Include="..\..\..\source\game\sound\*.h" />
<ClInclude Include="..\..\..\source\game\steam\*.h" />
<ClInclude Include="..\..\..\source\game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\game\types\*.h" />
<ClInclude Include="..\..\..\source\game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\game\world\*.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\zetaglest.rc" />
<ResourceCompile Include="..\glest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -769,7 +769,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

20
mk/windows/vs2015-32/libzetaglest.vcxproj → mk/windows/vs2015-32/libglest.vcxproj
View File

@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>libzetaglest</ProjectName>
<ProjectName>libglest</ProjectName>
<ProjectGuid>{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}</ProjectGuid>
<RootNamespace>libzetaglest</RootNamespace>
<RootNamespace>libglest</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -127,42 +127,42 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>

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

@@ -103,7 +103,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,7 +131,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -157,7 +157,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -197,7 +197,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -238,16 +238,16 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_map_editor\main.h" />
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
<ClInclude Include="..\..\..\source\map_editor\main.h" />
<ClInclude Include="..\..\..\source\map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\map_editor\program.cpp" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -255,7 +255,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

4
mk/windows/vs2015-64/ZetaGlest.sln → mk/windows/vs2015-64/Glest.sln
View File

@@ -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

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

@@ -110,7 +110,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -127,9 +127,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)G3D_Viewer.exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -138,7 +138,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -154,9 +154,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)G3D_Viewer.exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -164,7 +164,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>
@@ -201,7 +201,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -219,9 +219,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>
@@ -238,7 +238,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -281,7 +281,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -301,9 +301,9 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>
@@ -325,10 +325,10 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\g3d_viewer\main.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\unit_particle_type.cpp" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -336,7 +336,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

116
mk/windows/vs2015-64/zetaglest.vcxproj → mk/windows/vs2015-64/glest.vcxproj
View File

@@ -12,8 +12,8 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
<RootNamespace>zetaglest</RootNamespace>
<ProjectName>zetaglest</ProjectName>
<RootNamespace>glest</RootNamespace>
<ProjectName>glest</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -111,12 +111,12 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">glest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
@@ -136,7 +136,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -161,19 +161,19 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -182,7 +182,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -206,18 +206,18 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -229,7 +229,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -247,7 +247,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -281,7 +281,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -299,7 +299,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -333,7 +333,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -351,7 +351,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -384,7 +384,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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\</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -435,7 +435,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -486,7 +486,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -505,7 +505,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -529,42 +529,42 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\game\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\main\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\network\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\glest_game\types\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\world\*.cpp" />
<ClCompile Include="..\..\..\source\game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\game\game\*.cpp" />
<ClCompile Include="..\..\..\source\game\global\*.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\game\main\*.cpp" />
<ClCompile Include="..\..\..\source\game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\game\network\*.cpp" />
<ClCompile Include="..\..\..\source\game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\game\types\*.cpp" />
<ClCompile Include="..\..\..\source\game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\game\world\*.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_game\facilities\*.h" />
<ClInclude Include="..\..\..\source\glest_game\ai\*.h" />
<ClInclude Include="..\..\..\source\glest_game\game\*.h" />
<ClInclude Include="..\..\..\source\glest_game\global\*.h" />
<ClInclude Include="..\..\..\source\glest_game\graphics\*.h" />
<ClInclude Include="..\..\..\source\glest_game\gui\*.h" />
<ClInclude Include="..\..\..\source\glest_game\main\*.h" />
<ClInclude Include="..\..\..\source\glest_game\menu\*.h" />
<ClInclude Include="..\..\..\source\glest_game\network\*.h" />
<ClInclude Include="..\..\..\source\glest_game\sound\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steam\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\glest_game\types\*.h" />
<ClInclude Include="..\..\..\source\glest_game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\glest_game\world\*.h" />
<ClInclude Include="..\..\..\source\game\facilities\*.h" />
<ClInclude Include="..\..\..\source\game\ai\*.h" />
<ClInclude Include="..\..\..\source\game\game\*.h" />
<ClInclude Include="..\..\..\source\game\global\*.h" />
<ClInclude Include="..\..\..\source\game\graphics\*.h" />
<ClInclude Include="..\..\..\source\game\gui\*.h" />
<ClInclude Include="..\..\..\source\game\main\*.h" />
<ClInclude Include="..\..\..\source\game\menu\*.h" />
<ClInclude Include="..\..\..\source\game\network\*.h" />
<ClInclude Include="..\..\..\source\game\sound\*.h" />
<ClInclude Include="..\..\..\source\game\steam\*.h" />
<ClInclude Include="..\..\..\source\game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\game\types\*.h" />
<ClInclude Include="..\..\..\source\game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\game\world\*.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\zetaglest.rc" />
<ResourceCompile Include="..\glest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -581,7 +581,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

16
mk/windows/vs2015-64/libzetaglest.vcxproj → mk/windows/vs2015-64/libglest.vcxproj
View File

@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>libzetaglest</ProjectName>
<ProjectName>libglest</ProjectName>
<ProjectGuid>{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}</ProjectGuid>
<RootNamespace>libzetaglest</RootNamespace>
<RootNamespace>libglest</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -103,28 +103,28 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>

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

@@ -107,7 +107,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -124,9 +124,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -135,7 +135,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -151,9 +151,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -161,7 +161,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -178,9 +178,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
@@ -197,7 +197,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -214,9 +214,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
@@ -233,7 +233,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -276,7 +276,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -295,9 +295,9 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
@@ -312,16 +312,16 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_map_editor\main.h" />
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
<ClInclude Include="..\..\..\source\map_editor\main.h" />
<ClInclude Include="..\..\..\source\map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\map_editor\program.cpp" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -329,7 +329,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

4
mk/windows/vs2017-32/ZetaGlest.sln → mk/windows/vs2017-32/Glest.sln
View File

@@ -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

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

@@ -106,7 +106,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -134,7 +134,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -160,7 +160,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -201,7 +201,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -250,10 +250,10 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\g3d_viewer\main.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\unit_particle_type.cpp" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -261,7 +261,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

132
mk/windows/vs2017-32/zetaglest.vcxproj → mk/windows/vs2017-32/glest.vcxproj
View File

@@ -12,8 +12,8 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
<RootNamespace>zetaglest</RootNamespace>
<ProjectName>zetaglest</ProjectName>
<RootNamespace>glest</RootNamespace>
<ProjectName>glest</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -139,14 +139,14 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">glest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
@@ -178,7 +178,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -203,19 +203,19 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -224,7 +224,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -248,18 +248,18 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -268,7 +268,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -292,18 +292,18 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -315,7 +315,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -333,7 +333,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -367,7 +367,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -385,7 +385,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -418,7 +418,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -470,7 +470,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -521,7 +521,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -572,7 +572,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -623,7 +623,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -642,7 +642,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -674,7 +674,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -693,7 +693,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -717,42 +717,42 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\game\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\main\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\network\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\glest_game\types\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\world\*.cpp" />
<ClCompile Include="..\..\..\source\game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\game\game\*.cpp" />
<ClCompile Include="..\..\..\source\game\global\*.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\game\main\*.cpp" />
<ClCompile Include="..\..\..\source\game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\game\network\*.cpp" />
<ClCompile Include="..\..\..\source\game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\game\types\*.cpp" />
<ClCompile Include="..\..\..\source\game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\game\world\*.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_game\facilities\*.h" />
<ClInclude Include="..\..\..\source\glest_game\ai\*.h" />
<ClInclude Include="..\..\..\source\glest_game\game\*.h" />
<ClInclude Include="..\..\..\source\glest_game\global\*.h" />
<ClInclude Include="..\..\..\source\glest_game\graphics\*.h" />
<ClInclude Include="..\..\..\source\glest_game\gui\*.h" />
<ClInclude Include="..\..\..\source\glest_game\main\*.h" />
<ClInclude Include="..\..\..\source\glest_game\menu\*.h" />
<ClInclude Include="..\..\..\source\glest_game\network\*.h" />
<ClInclude Include="..\..\..\source\glest_game\sound\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steam\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\glest_game\types\*.h" />
<ClInclude Include="..\..\..\source\glest_game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\glest_game\world\*.h" />
<ClInclude Include="..\..\..\source\game\facilities\*.h" />
<ClInclude Include="..\..\..\source\game\ai\*.h" />
<ClInclude Include="..\..\..\source\game\game\*.h" />
<ClInclude Include="..\..\..\source\game\global\*.h" />
<ClInclude Include="..\..\..\source\game\graphics\*.h" />
<ClInclude Include="..\..\..\source\game\gui\*.h" />
<ClInclude Include="..\..\..\source\game\main\*.h" />
<ClInclude Include="..\..\..\source\game\menu\*.h" />
<ClInclude Include="..\..\..\source\game\network\*.h" />
<ClInclude Include="..\..\..\source\game\sound\*.h" />
<ClInclude Include="..\..\..\source\game\steam\*.h" />
<ClInclude Include="..\..\..\source\game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\game\types\*.h" />
<ClInclude Include="..\..\..\source\game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\game\world\*.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\zetaglest.rc" />
<ResourceCompile Include="..\glest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -769,7 +769,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

20
mk/windows/vs2017-32/libzetaglest.vcxproj → mk/windows/vs2017-32/libglest.vcxproj
View File

@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>libzetaglest</ProjectName>
<ProjectName>libglest</ProjectName>
<ProjectGuid>{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}</ProjectGuid>
<RootNamespace>libzetaglest</RootNamespace>
<RootNamespace>libglest</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -127,42 +127,42 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>

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

@@ -103,7 +103,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,7 +131,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -157,7 +157,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -197,7 +197,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -238,16 +238,16 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_map_editor\main.h" />
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
<ClInclude Include="..\..\..\source\map_editor\main.h" />
<ClInclude Include="..\..\..\source\map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\map_editor\program.cpp" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -255,7 +255,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

4
mk/windows/vs2017-64/ZetaGlest.sln → mk/windows/vs2017-64/Glest.sln
View File

@@ -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

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

@@ -110,7 +110,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -127,9 +127,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)G3D_Viewer.exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -138,7 +138,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\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</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -154,9 +154,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)G3D_Viewer.exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -164,7 +164,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>
@@ -201,7 +201,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -219,9 +219,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>
@@ -238,7 +238,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -281,7 +281,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -301,9 +301,9 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>
@@ -325,10 +325,10 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\g3d_viewer\main.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\particle_type.cpp" />
<ClCompile Include="..\..\..\source\g3d_viewer\renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\unit_particle_type.cpp" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -336,7 +336,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

116
mk/windows/vs2017-64/zetaglest.vcxproj → mk/windows/vs2017-64/glest.vcxproj
View File

@@ -12,8 +12,8 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
<RootNamespace>zetaglest</RootNamespace>
<ProjectName>zetaglest</ProjectName>
<RootNamespace>glest</RootNamespace>
<ProjectName>glest</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -111,12 +111,12 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">zetaglest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">glest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">glest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
@@ -136,7 +136,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -161,19 +161,19 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<TargetMachine>MachineX86</TargetMachine>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -182,7 +182,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -206,18 +206,18 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LinkTimeCodeGeneration>
</LinkTimeCodeGeneration>
<OutputFile>$(OutDir)\zetaglest.exe</OutputFile>
<OutputFile>$(OutDir)\glest.exe</OutputFile>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>false</DataExecutionPrevention>
<ProgramDatabaseFile>$(OutDir)\zetaglest.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)\glest.pdb</ProgramDatabaseFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -229,7 +229,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -247,7 +247,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -281,7 +281,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -299,7 +299,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -333,7 +333,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -351,7 +351,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -384,7 +384,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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\</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -435,7 +435,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -486,7 +486,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../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</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
@@ -505,7 +505,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)\libglest$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -529,42 +529,42 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\game\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\global\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\main\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\network\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\glest_game\types\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\glest_game\world\*.cpp" />
<ClCompile Include="..\..\..\source\game\facilities\*.cpp" />
<ClCompile Include="..\..\..\source\game\ai\*.cpp" />
<ClCompile Include="..\..\..\source\game\game\*.cpp" />
<ClCompile Include="..\..\..\source\game\global\*.cpp" />
<ClCompile Include="..\..\..\source\game\graphics\*.cpp" />
<ClCompile Include="..\..\..\source\game\gui\*.cpp" />
<ClCompile Include="..\..\..\source\game\main\*.cpp" />
<ClCompile Include="..\..\..\source\game\menu\*.cpp" />
<ClCompile Include="..\..\..\source\game\network\*.cpp" />
<ClCompile Include="..\..\..\source\game\sound\*.cpp" />
<ClCompile Include="..\..\..\source\game\steam\*.cpp" />
<ClCompile Include="..\..\..\source\game\steamshim\*.c" />
<ClCompile Include="..\..\..\source\game\types\*.cpp" />
<ClCompile Include="..\..\..\source\game\type_instances\*.cpp" />
<ClCompile Include="..\..\..\source\game\world\*.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_game\facilities\*.h" />
<ClInclude Include="..\..\..\source\glest_game\ai\*.h" />
<ClInclude Include="..\..\..\source\glest_game\game\*.h" />
<ClInclude Include="..\..\..\source\glest_game\global\*.h" />
<ClInclude Include="..\..\..\source\glest_game\graphics\*.h" />
<ClInclude Include="..\..\..\source\glest_game\gui\*.h" />
<ClInclude Include="..\..\..\source\glest_game\main\*.h" />
<ClInclude Include="..\..\..\source\glest_game\menu\*.h" />
<ClInclude Include="..\..\..\source\glest_game\network\*.h" />
<ClInclude Include="..\..\..\source\glest_game\sound\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steam\*.h" />
<ClInclude Include="..\..\..\source\glest_game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\glest_game\types\*.h" />
<ClInclude Include="..\..\..\source\glest_game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\glest_game\world\*.h" />
<ClInclude Include="..\..\..\source\game\facilities\*.h" />
<ClInclude Include="..\..\..\source\game\ai\*.h" />
<ClInclude Include="..\..\..\source\game\game\*.h" />
<ClInclude Include="..\..\..\source\game\global\*.h" />
<ClInclude Include="..\..\..\source\game\graphics\*.h" />
<ClInclude Include="..\..\..\source\game\gui\*.h" />
<ClInclude Include="..\..\..\source\game\main\*.h" />
<ClInclude Include="..\..\..\source\game\menu\*.h" />
<ClInclude Include="..\..\..\source\game\network\*.h" />
<ClInclude Include="..\..\..\source\game\sound\*.h" />
<ClInclude Include="..\..\..\source\game\steam\*.h" />
<ClInclude Include="..\..\..\source\game\steamshim\*.h" />
<ClInclude Include="..\..\..\source\game\types\*.h" />
<ClInclude Include="..\..\..\source\game\type_instances\*.h" />
<ClInclude Include="..\..\..\source\game\world\*.h" />
<ClInclude Include="..\..\..\source\shared_lib\include\util\*.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\zetaglest.rc" />
<ResourceCompile Include="..\glest.rc" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -581,7 +581,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

16
mk/windows/vs2017-64/libzetaglest.vcxproj → mk/windows/vs2017-64/libglest.vcxproj
View File

@@ -11,9 +11,9 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>libzetaglest</ProjectName>
<ProjectName>libglest</ProjectName>
<ProjectGuid>{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}</ProjectGuid>
<RootNamespace>libzetaglest</RootNamespace>
<RootNamespace>libglest</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -103,28 +103,28 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<TargetName>libzetaglest</TargetName>
<TargetName>libglest</TargetName>
<OutDir>$(SolutionDir)\$(TargetName)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)\$(TargetName)$(Platform)_obj\$(Configuration)\</IntDir>
</PropertyGroup>

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

@@ -107,7 +107,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -124,9 +124,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -135,7 +135,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI_DEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -151,9 +151,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libzetaglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../../../source/windows_deps_2015/lib;$(SolutionDir)\libglest$(Platform)\$(Configuration);$(SolutionDir)\libstreflop$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -161,7 +161,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -178,9 +178,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
@@ -197,7 +197,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
<ClCompile>
<AdditionalOptions>/arch:SSE2 %(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -214,9 +214,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
@@ -233,7 +233,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -276,7 +276,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|x64'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<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\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)</AdditionalIncludeDirectories>
<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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -295,9 +295,9 @@
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<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;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)</AdditionalDependencies>
<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)</AdditionalDependencies>
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>../../../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)</AdditionalLibraryDirectories>
<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)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
@@ -312,16 +312,16 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\source\glest_map_editor\main.h" />
<ClInclude Include="..\..\..\source\glest_map_editor\program.h" />
<ClInclude Include="..\..\..\source\map_editor\main.h" />
<ClInclude Include="..\..\..\source\map_editor\program.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\map_editor.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\source\glest_game\global\config.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
<ClCompile Include="..\..\..\source\game\global\config.cpp" />
<ClCompile Include="..\..\..\source\map_editor\main.cpp" />
<ClCompile Include="..\..\..\source\map_editor\program.cpp" />
</ItemGroup>
<ItemGroup>
<Content Include="..\glest.ini">
@@ -329,7 +329,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libzetaglest.vcxproj">
<ProjectReference Include="libglest.vcxproj">
<Project>{8daa0c24-95cd-4f66-b4c5-19abdd771746}</Project>
</ProjectReference>
</ItemGroup>

BIN
mk/windows/vs2017-64/zetaglest/Start Headless Server.lnk
View File

Binary file not shown.

1
mk/windows/zetaglest.rc
View File

@@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "..\shared\zetaglest.ico"

6
packaging/NOTES
View File

@@ -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

4
packaging/Slackbuild/zetaglest/README → packaging/Slackbuild/glest/README
View File

@@ -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

103
packaging/Slackbuild/glest/README.Slackware Normal file
View File

@@ -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)<br >
* [![RSS](rss_23x23.jpeg)](https://glest.github.io/feed.xml)
[The Glest Blog](https://glest.github.io/blog/)<br >
* [![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)<br >
* [![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)<br >
* [![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

0
packaging/Slackbuild/zetaglest/doinst.sh → packaging/Slackbuild/glest/doinst.sh
View File

6
packaging/Slackbuild/zetaglest/zetaglest.SlackBuild → packaging/Slackbuild/glest/glest.SlackBuild Executable file → Normal file
View File

@@ -5,8 +5,8 @@
# Copyright 2011-2017 Larry Hajali <larryhaj[at]gmail[dot]com>
# All rights reserved.
#
# Modified for ZetaGlest
# Copyright 2018 The ZetaGlest Team <andy400-dev@yahoo.com>
# Modified for Glest
# Copyright 2018 The Glest Team <andy400-dev@yahoo.com>
#
# 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}

4
packaging/Slackbuild/zetaglest/zetaglest.info → packaging/Slackbuild/glest/glest.info
View File

@@ -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 \

21
packaging/Slackbuild/glest/slack-desc Normal file
View File

@@ -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/

103
packaging/Slackbuild/zetaglest/README.Slackware
View File

@@ -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)<br >
* [![RSS](rss_23x23.jpeg)](https://zetaglest.github.io/feed.xml)
[The ZetaGlest Blog](https://zetaglest.github.io/blog/)<br >
* [![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)<br >
* [![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)<br >
* [![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

21
packaging/Slackbuild/zetaglest/slack-desc
View File

@@ -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/

4
packaging/debian/changelog
View File

@@ -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 <andy400-dev@yahoo.com> 15.09.2018 2018/09/15 12:44:46

6
packaging/debian/clean
View File

@@ -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

12
packaging/debian/control
View File

@@ -1,7 +1,7 @@
Source: zetaglest
Source: glest
Section: games
Priority: extra
Maintainer: ZetaGlest Team <zetaglest@gmail.com>
Maintainer: Glest Team <glest@gmail.com>
Uploaders:
Andy Alt <andy400-dev@yahoo.com>
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

10
packaging/debian/copyright
View File

@@ -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 <andy400-dev@yahoo.com>
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 <mark_vejvoda@hotmail.com>
2012-2013, Paul Wise <pabs@debian.org>
2014-2016, Markus Koschany <apo@debian.org>
2018 The ZetaGlest Team <zetaglest@gmail.com>
2018 The Glest Team <glest@gmail.com>
License: GPL-3+
Files: mk/cmake/Modules/FindGLIB2.cmake

Some files were not shown because too many files have changed in this diff Show More