mirror of
https://github.com/glest/glest-source.git
synced 2025-09-02 20:42:34 +02:00
Merge branch 'develop' into issue_70
This commit is contained in:
MathuSum Mut
GitHub
14
.gitignore
vendored
14
.gitignore
vendored
@@ -93,10 +93,18 @@ $RECYCLE.BIN/
|
||||
unsuccessfulbuild
|
||||
/mk/windows/dependencies/openssl
|
||||
/mk/windows/dependencies/src
|
||||
/mk/windows/bin
|
||||
/data
|
||||
#
|
||||
/mk/linux/zetaglest
|
||||
/mk/linux/zetaglest_editor
|
||||
/mk/linux/zetaglest_g3dviewer
|
||||
source/masterserver
|
||||
mk/linux/tools-for-standalone-client/installer/mojosetup
|
||||
|
||||
# These are generated when 'cmake . && make' is run from the root directory
|
||||
CMakeFiles
|
||||
CMakeCache.txt
|
||||
Makefile
|
||||
cmake_install.cmake
|
||||
CPackConfig.cmake
|
||||
CPackSourceConfig.cmake
|
||||
/source/shared_lib/liblibmegaglest.a
|
||||
/source/shared_lib/sources/streflop/libstreflop.a
|
||||
|
||||
25
BUILD.md
25
BUILD.md
@@ -68,10 +68,23 @@ libwxgtk3.0-dev libxml2-dev
|
||||
|
||||
Follow the [instructions](https://github.com/ZetaGlest/zetaglest-source/blob/develop/mk/windows/README.md) listed in the `Windows` directory.
|
||||
|
||||
### *BSD
|
||||
### OpenBSD
|
||||
|
||||
(Need editing/updating)
|
||||
[Current Status](https://github.com/ZetaGlest/zetaglest-source/issues/56)
|
||||
Below is a list of most of dependencies you will need.
|
||||
|
||||
cmake libvorbis lua sdl2 openal wxWidgets fribidi ftgl nghttp2 gnutls glew jpeg png
|
||||
miniupnpc curl freeealut
|
||||
|
||||
A C++11 compiler is mandatory, so base (or package) clang++, or eg++ (from 4.9.3)
|
||||
|
||||
You can install the dependencies using `pkg_add`:
|
||||
|
||||
`pkg_add curl libvorbis openal sdl2 git miniupnpc cmake wxWidgets
|
||||
xerces-c lua icu4c freealut`
|
||||
|
||||
#### Optional
|
||||
|
||||
`pkg_add g++ (either 4.9.3 or 6.2.0)`
|
||||
|
||||
### Arch Linux
|
||||
|
||||
@@ -98,8 +111,10 @@ lua51 miniupnpc openal sdl2 wxgtk3 xerces-c cmake ftjam git mesa`
|
||||
|
||||
./build-zg.bat
|
||||
|
||||
### BSD
|
||||
### OpenBSD
|
||||
|
||||
(Need editing/updating)
|
||||
`cmake <-DCMAKE_CXX_COMPILER=eg++>`
|
||||
|
||||
`make`
|
||||
|
||||
### Other (add sections)
|
||||
|
||||
180
CMakeLists.txt
180
CMakeLists.txt
@@ -1,11 +1,11 @@
|
||||
CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 )
|
||||
PROJECT( MegaGlest )
|
||||
PROJECT( ZetaGlest )
|
||||
|
||||
#SET(CMAKE_VERBOSE_MAKEFILE ON)
|
||||
|
||||
#
|
||||
# *NOTE: For now we assume some variation of GCC Compiler (or MingW for Windows binaries)
|
||||
# VC++ users should not use CMake yet but rather the build-mg.bat file in mk/windows
|
||||
# VC++ users should not use CMake yet but rather the build-zg.bat file in mk/windows
|
||||
#
|
||||
|
||||
# build type
|
||||
@@ -30,11 +30,11 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
ADD_DEFINITIONS("-Wno-switch")
|
||||
ENDIF()
|
||||
|
||||
OPTION(BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS "Build model import/export tools" ON)
|
||||
OPTION(BUILD_MEGAGLEST_MODEL_VIEWER "Build model viewer" ON)
|
||||
OPTION(BUILD_MEGAGLEST_MAP_EDITOR "Build map editor" ON)
|
||||
OPTION(BUILD_MEGAGLEST "Build MegaGlest" ON)
|
||||
OPTION(BUILD_MEGAGLEST_TESTS "Build MegaGlest Unit Tests" OFF)
|
||||
OPTION(BUILD_ZETAGLEST_MODEL_IMPORT_EXPORT_TOOLS "Build model import/export tools" ON)
|
||||
OPTION(BUILD_ZETAGLEST_MODEL_VIEWER "Build model viewer" ON)
|
||||
OPTION(BUILD_ZETAGLEST_MAP_EDITOR "Build map editor" ON)
|
||||
OPTION(BUILD_ZETAGLEST "Build ZetaGlest" ON)
|
||||
OPTION(BUILD_ZETAGLEST_TESTS "Build ZetaGlest Unit Tests" OFF)
|
||||
OPTION(WANT_SINGLE_INSTALL_DIRECTORY "Use single install directory for everything. It is useful for example for MacOS cpack bundles." OFF)
|
||||
OPTION(WANT_STATIC_LIBS "Builds as many static libs as possible." OFF)
|
||||
OPTION(WANT_USE_VLC "Use libVLC to play videos." ON)
|
||||
@@ -58,37 +58,37 @@ include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/SpecialMacros.cmake)
|
||||
include(${CMAKE_SOURCE_DIR}/mk/cmake/Modules/ReqVersAndStaticConf.cmake)
|
||||
MESSAGE(STATUS "=====================================================================")
|
||||
|
||||
SET(PKG_NAME "megaglest")
|
||||
SET(PKG_NAME "zetaglest")
|
||||
# read version
|
||||
FILE(READ ${PROJECT_SOURCE_DIR}/source/glest_game/facilities/game_util.cpp MG_VERSION_H_CONTENTS)
|
||||
FILE(READ ${PROJECT_SOURCE_DIR}/source/glest_game/facilities/game_util.cpp ZG_VERSION_H_CONTENTS)
|
||||
MESSAGE(STATUS "Determining version number system type to use:")
|
||||
SET(Begin_otv_string "string glestVersionString")
|
||||
STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\\.]*)(\\.)([^\"\\.;]*)\";" _threePartMatch "${MG_VERSION_H_CONTENTS}")
|
||||
STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\"\\.;]*)\";" _twoPartMatch "${MG_VERSION_H_CONTENTS}")
|
||||
STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\"\\.;]*)\";" _onePartMatch "${MG_VERSION_H_CONTENTS}")
|
||||
STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\\.]*)(\\.)([^\"\\.;]*)\";" _threePartMatch "${ZG_VERSION_H_CONTENTS}")
|
||||
STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)(\\.)([^\"\\.;]*)\";" _twoPartMatch "${ZG_VERSION_H_CONTENTS}")
|
||||
STRING(REGEX MATCH "${Begin_otv_string}[ \t]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\"\\.;]*)\";" _onePartMatch "${ZG_VERSION_H_CONTENTS}")
|
||||
IF(_threePartMatch)
|
||||
MESSAGE(STATUS "** Trying 3 part versioning ")
|
||||
STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)\\.[^\\.]*\\..*" "\\1" VER_MAJOR "${_threePartMatch}")
|
||||
STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.([^\\.]*)\\..*" "\\1" VER_MINOR "${_threePartMatch}")
|
||||
STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.[^\\.]*\\.([^\"\\.;]*).*" "\\1" VER_PATCH "${_threePartMatch}")
|
||||
SET(MEGAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
|
||||
SET(ZETAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
|
||||
ELSEIF(_twoPartMatch)
|
||||
MESSAGE(STATUS "** Trying 2 part versioning ")
|
||||
STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\\.]*)\\..*" "\\1" VER_MAJOR "${_twoPartMatch}")
|
||||
STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*[0-9][^\\.]*\\.([^\"\\.;]*).*" "\\1" VER_MINOR "${_twoPartMatch}")
|
||||
SET(VER_PATCH "0")
|
||||
SET(MEGAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}")
|
||||
SET(ZETAGLEST_VERSION "${VER_MAJOR}.${VER_MINOR}")
|
||||
ELSEIF(_onePartMatch)
|
||||
MESSAGE(STATUS "** Trying 1 part versioning ")
|
||||
STRING(REGEX REPLACE "[^=]*=[ \t]*\"[ \t]*v[ \t]*([0-9][^\"\\.;]*).*" "\\1" VER_MAJOR "${_onePartMatch}")
|
||||
SET(VER_MINOR "0")
|
||||
SET(VER_PATCH "0")
|
||||
SET(MEGAGLEST_VERSION "${VER_MAJOR}")
|
||||
SET(ZETAGLEST_VERSION "${VER_MAJOR}")
|
||||
ENDIF()
|
||||
FOREACH(ver_var VER_MAJOR;VER_MINOR;VER_PATCH;MEGAGLEST_VERSION)
|
||||
FOREACH(ver_var VER_MAJOR;VER_MINOR;VER_PATCH;ZETAGLEST_VERSION)
|
||||
STRING(REGEX REPLACE "[ \t]" "" "${ver_var}" "${${ver_var}}")
|
||||
ENDFOREACH()
|
||||
MESSAGE(STATUS "Detected MegaGlest Version is [v${MEGAGLEST_VERSION}] ")
|
||||
MESSAGE(STATUS "Detected ZetaGlest Version is [v${ZETAGLEST_VERSION}] ")
|
||||
|
||||
SET(PIC_FLAG "${PIC_FLAG} -fPIC")
|
||||
IF(WANT_STATIC_LIBS AND "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
||||
@@ -210,121 +210,79 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -s") ## Strip binary
|
||||
ENDIF()
|
||||
|
||||
# see if this fixes compile issue for tomreyn: libpthread.so.0: error adding symbols: DSO missing from command line
|
||||
IF(UNIX)
|
||||
MESSAGE(STATUS "*NOTE: Apply fix for: libpthread.so.0: error adding symbols: DSO missing from command line")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
|
||||
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -pthread")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pthread")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -pthread")
|
||||
ENDIF()
|
||||
|
||||
# Get the git revision info for the binary
|
||||
SET(HAS_GIT "FALSE")
|
||||
SET(GIT_LIVE_REV_CMD "")
|
||||
|
||||
OPTION(WANT_GIT_STAMP "use git revision stamp" ON)
|
||||
IF(WANT_GIT_STAMP)
|
||||
# The stuff below gets GIT Global Revision # but ONLY when calling cmake!
|
||||
# the FindGit.cmake module is part of the standard distribution
|
||||
include(FindGit)
|
||||
|
||||
IF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git/")
|
||||
SET(HAS_GIT "TRUE")
|
||||
MESSAGE(STATUS "Found GIT and using GIT version stamping...")
|
||||
|
||||
# Get the current commit SHA1
|
||||
execute_process(
|
||||
COMMAND git log -1 --format=%h --abbrev=7
|
||||
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
|
||||
OUTPUT_VARIABLE GIT_SHA1
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
|
||||
# Get the current version counter
|
||||
execute_process(
|
||||
COMMAND git rev-list HEAD --count
|
||||
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
|
||||
OUTPUT_VARIABLE GIT_COMMIT_COUNT
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
|
||||
SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h --abbrev=7`")
|
||||
|
||||
MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]")
|
||||
|
||||
IF(CMAKE_GENERATOR STREQUAL Xcode)
|
||||
SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_COMMIT_COUNT}.${GIT_SHA1}\\\\''")
|
||||
ELSE()
|
||||
SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_LIVE_REV_CMD}\\\"'")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
# see if this fixes compile issue for tomreyn: libpthread.so.0: error adding symbols: DSO missing from command line
|
||||
IF(UNIX)
|
||||
MESSAGE(STATUS "*NOTE: Apply fix for: libpthread.so.0: error adding symbols: DSO missing from command line")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
|
||||
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -pthread")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -pthread")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -pthread")
|
||||
ENDIF()
|
||||
|
||||
SET(COMMON_INFO_ABOUT_PATH "(if the path is relative then is appended to the CMAKE_INSTALL_PREFIX)")
|
||||
IF(CMAKE_INSTALL_PREFIX STREQUAL "")
|
||||
MESSAGE(STATUS "*NOTE: NOT USING a Custom Data Install Path...")
|
||||
ELSE()
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND NOT MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH)
|
||||
SET(MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH "megaglest-game/" CACHE STRING "The single directory installation path for game ${COMMON_INFO_ABOUT_PATH}")
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND NOT ZETAGLEST_SINGLE_DIRECTORY_INSTALL_PATH)
|
||||
SET(ZETAGLEST_SINGLE_DIRECTORY_INSTALL_PATH "zetaglest-game/" CACHE STRING "The single directory installation path for game ${COMMON_INFO_ABOUT_PATH}")
|
||||
ENDIF()
|
||||
IF(NOT MEGAGLEST_BIN_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(MEGAGLEST_BIN_INSTALL_PATH "bin/" CACHE STRING "The installation path for binaries ${COMMON_INFO_ABOUT_PATH}")
|
||||
IF(NOT ZETAGLEST_BIN_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(ZETAGLEST_BIN_INSTALL_PATH "bin/" CACHE STRING "The installation path for binaries ${COMMON_INFO_ABOUT_PATH}")
|
||||
ENDIF()
|
||||
IF(NOT MEGAGLEST_DATA_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files ${COMMON_INFO_ABOUT_PATH}")
|
||||
IF(NOT ZETAGLEST_DATA_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(ZETAGLEST_DATA_INSTALL_PATH "share/zetaglest/" CACHE STRING "The installation path for data files ${COMMON_INFO_ABOUT_PATH}")
|
||||
ENDIF()
|
||||
SET(MEGAGLEST_INI_INSTALL_PATH "${MEGAGLEST_DATA_INSTALL_PATH}")
|
||||
IF(NOT MEGAGLEST_DESKTOP_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(MEGAGLEST_DESKTOP_INSTALL_PATH "share/applications/" CACHE STRING "The installation path for desktop files ${COMMON_INFO_ABOUT_PATH}")
|
||||
SET(ZETAGLEST_INI_INSTALL_PATH "${ZETAGLEST_DATA_INSTALL_PATH}")
|
||||
IF(NOT ZETAGLEST_DESKTOP_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(ZETAGLEST_DESKTOP_INSTALL_PATH "share/applications/" CACHE STRING "The installation path for desktop files ${COMMON_INFO_ABOUT_PATH}")
|
||||
ENDIF()
|
||||
IF(NOT MEGAGLEST_ICON_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files ${COMMON_INFO_ABOUT_PATH}")
|
||||
IF(NOT ZETAGLEST_ICON_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(ZETAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files ${COMMON_INFO_ABOUT_PATH}")
|
||||
ENDIF()
|
||||
IF(NOT MEGAGLEST_MANPAGE_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(MEGAGLEST_MANPAGE_INSTALL_PATH "share/man/man6/" CACHE STRING "The installation path for manpage files ${COMMON_INFO_ABOUT_PATH}")
|
||||
IF(NOT ZETAGLEST_MANPAGE_INSTALL_PATH AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
SET(ZETAGLEST_MANPAGE_INSTALL_PATH "share/man/man6/" CACHE STRING "The installation path for manpage files ${COMMON_INFO_ABOUT_PATH}")
|
||||
ENDIF()
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
FOREACH(MG_PATH BIN DATA INI DESKTOP ICON)
|
||||
IF(NOT MEGAGLEST_${MG_PATH}_INSTALL_PATH)
|
||||
SET(MEGAGLEST_${MG_PATH}_INSTALL_PATH "${MEGAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
|
||||
FOREACH(ZG_PATH BIN DATA INI DESKTOP ICON)
|
||||
IF(NOT ZETAGLEST_${ZG_PATH}_INSTALL_PATH)
|
||||
SET(ZETAGLEST_${ZG_PATH}_INSTALL_PATH "${ZETAGLEST_SINGLE_DIRECTORY_INSTALL_PATH}")
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
ENDIF()
|
||||
IF(NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
FOREACH(MG_PATH DATA INI)
|
||||
IF(IS_ABSOLUTE "${MEGAGLEST_${MG_PATH}_INSTALL_PATH}")
|
||||
SET(MEGAGLEST_FULL_${MG_PATH}_INSTALL_PATH "${MEGAGLEST_${MG_PATH}_INSTALL_PATH}/")
|
||||
FOREACH(ZG_PATH DATA INI)
|
||||
IF(IS_ABSOLUTE "${ZETAGLEST_${ZG_PATH}_INSTALL_PATH}")
|
||||
SET(ZETAGLEST_FULL_${ZG_PATH}_INSTALL_PATH "${ZETAGLEST_${ZG_PATH}_INSTALL_PATH}/")
|
||||
ELSE()
|
||||
SET(MEGAGLEST_FULL_${MG_PATH}_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_${MG_PATH}_INSTALL_PATH}/")
|
||||
SET(ZETAGLEST_FULL_${ZG_PATH}_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${ZETAGLEST_${ZG_PATH}_INSTALL_PATH}/")
|
||||
ENDIF()
|
||||
STRING(REGEX REPLACE "//+" "/" MEGAGLEST_FULL_${MG_PATH}_INSTALL_PATH "${MEGAGLEST_FULL_${MG_PATH}_INSTALL_PATH}")
|
||||
STRING(REGEX REPLACE "//+" "/" ZETAGLEST_FULL_${ZG_PATH}_INSTALL_PATH "${ZETAGLEST_FULL_${ZG_PATH}_INSTALL_PATH}")
|
||||
ENDFOREACH()
|
||||
|
||||
IF(NOT CUSTOM_DATA_INSTALL_PATH)
|
||||
SET(CUSTOM_DATA_INSTALL_PATH "${MEGAGLEST_FULL_DATA_INSTALL_PATH}")
|
||||
SET(CUSTOM_DATA_INSTALL_PATH "${ZETAGLEST_FULL_DATA_INSTALL_PATH}")
|
||||
# ^ someday this intermediate step may be removed
|
||||
ENDIF()
|
||||
SET(CUSTOM_INSTALL_PATHS_VALUES "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}")
|
||||
ENDIF()
|
||||
|
||||
#SET(PKG_DATADIR ${CUSTOM_DATA_INSTALL_PATH_VALUE})
|
||||
#SET(PKG_BINDIR ${MEGAGLEST_BIN_INSTALL_PATH})
|
||||
#SET(PKG_BINDIR ${ZETAGLEST_BIN_INSTALL_PATH})
|
||||
# ^ hard to tell for what it is needed and most likely both were set to wrong values, so let's try to not use them
|
||||
MESSAGE(STATUS "*NOTE: Custom Data Install Path is [${CUSTOM_DATA_INSTALL_PATH}]")
|
||||
ENDIF()
|
||||
|
||||
string(TOUPPER "${CMAKE_BUILD_TYPE}" MG_BUILD_TYPE)
|
||||
string(TOUPPER "${CMAKE_BUILD_TYPE}" ZG_BUILD_TYPE)
|
||||
IF(HAS_GIT STREQUAL "TRUE")
|
||||
SET(CMAKE_CXX_FLAGS_${MG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}} ${GIT_VERSION_CMD}")
|
||||
SET(CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}} ${GIT_VERSION_CMD}")
|
||||
ENDIF()
|
||||
SET(CMAKE_CXX_FLAGS_${MG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}} ${CUSTOM_INSTALL_PATHS_VALUES}")
|
||||
SET(CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}} ${CUSTOM_INSTALL_PATHS_VALUES}")
|
||||
|
||||
# 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_${MG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}}")
|
||||
string(REPLACE "'" "\"" CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}}")
|
||||
|
||||
message(STATUS "CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}}")
|
||||
message(STATUS "CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${ZG_BUILD_TYPE}}")
|
||||
|
||||
# Win32 specific Compiler Flags
|
||||
IF(WIN32)
|
||||
@@ -348,10 +306,10 @@ IF(NOT WANT_DEPRECATION_WARNINGS)
|
||||
ENDIF()
|
||||
MARK_AS_ADVANCED(WANT_DEPRECATION_WARNINGS)
|
||||
|
||||
IF(NOT MG_CMAKE_INSTALL_PREFIX AND NOT CMAKE_INSTALL_PREFIX STREQUAL "")
|
||||
SET(MG_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
IF(NOT ZG_CMAKE_INSTALL_PREFIX AND NOT CMAKE_INSTALL_PREFIX STREQUAL "")
|
||||
SET(ZG_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
ENDIF()
|
||||
MESSAGE(STATUS "**NOTE: MG_CMAKE_INSTALL_PREFIX is [${MG_CMAKE_INSTALL_PREFIX}]")
|
||||
MESSAGE(STATUS "**NOTE: ZG_CMAKE_INSTALL_PREFIX is [${ZG_CMAKE_INSTALL_PREFIX}]")
|
||||
|
||||
SET(SDL_WINDOWS_DIR_DINC "SDL-2.0.x")
|
||||
SET(SDL_VERSION_NAME "SDL2")
|
||||
@@ -359,13 +317,13 @@ SET(SDL_VERSION_SNAME "sdl")
|
||||
|
||||
OPTION(WANT_DEV_OUTPATH "Use developer friendly output paths." OFF)
|
||||
IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/")
|
||||
SET(ZETAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/")
|
||||
ELSEIF(UNIX AND APPLE)
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macos/")
|
||||
SET(ZETAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macos/")
|
||||
ELSEIF(UNIX AND NOT APPLE)
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/other_unix/")
|
||||
SET(ZETAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/other_unix/")
|
||||
ELSE()
|
||||
SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/data/glest_game/")
|
||||
SET(ZETAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/data/glest_game/")
|
||||
ENDIF()
|
||||
|
||||
IF(WIN32)
|
||||
@@ -431,33 +389,33 @@ IF(NOT DEFINED CPACK_GENERATOR)
|
||||
ENDIF()
|
||||
# CPack configuration shared accross platforms
|
||||
SET(CPACK_PACKAGE_NAME ${PKG_NAME})
|
||||
IF(EXISTS "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in")
|
||||
FILE(READ "${PROJECT_SOURCE_DIR}/data/glest_game/others/megaglest-long-description.txt.in" MEGAGLEST_LONG_DESCRIPTION)
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${MEGAGLEST_LONG_DESCRIPTION}")
|
||||
IF(EXISTS "${PROJECT_SOURCE_DIR}/../zetaglest-data/others/zetaglest-long-description.txt.in")
|
||||
FILE(READ "${PROJECT_SOURCE_DIR}/../zetaglest-data/others/zetaglest-long-description.txt.in" ZETAGLEST_LONG_DESCRIPTION)
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${ZETAGLEST_LONG_DESCRIPTION}")
|
||||
ELSE()
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MegaGlest")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ZetaGlest")
|
||||
ENDIF()
|
||||
SET(CPACK_PACKAGE_VENDOR "megaglest.org")
|
||||
SET(CPACK_PACKAGE_VENDOR "zetaglest.github.io")
|
||||
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
|
||||
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
|
||||
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "megaglest")
|
||||
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "zetaglest")
|
||||
SET(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||
SET(CPACK_PACKAGE_VERSION "${MEGAGLEST_VERSION}")
|
||||
SET(CPACK_PACKAGE_VERSION "${ZETAGLEST_VERSION}")
|
||||
SET(CPACK_PACKAGE_VERSION_MAJOR "${VER_MAJOR}")
|
||||
SET(CPACK_PACKAGE_VERSION_MINOR "${VER_MINOR}")
|
||||
SET(CPACK_PACKAGE_VERSION_PATCH "${VER_PATCH}")
|
||||
|
||||
IF("${CPACK_GENERATOR}" STREQUAL "DEB")
|
||||
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Mark Vejvoda") #required
|
||||
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "ZetaGlest Team") #required
|
||||
SET(CPACK_DEBIAN_PACKAGE_SECTION "games")
|
||||
SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
|
||||
SET(CPACK_DEBIAN_PACKAGE_SUGGESTS "p7zip-full")
|
||||
ENDIF()
|
||||
IF("${CPACK_GENERATOR}" STREQUAL "NSIS")
|
||||
SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest")
|
||||
SET(CPACK_NSIS_DISPLAY_NAME "ZetaGlest")
|
||||
SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windows/zetaglest.ico")
|
||||
SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windows/zetaglest.ico")
|
||||
SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org")
|
||||
SET(CPACK_NSIS_URL_INFO_ABOUT "https://zetaglest.github.io")
|
||||
ENDIF()
|
||||
|
||||
INCLUDE(CPack)
|
||||
|
||||
23
ChangeLog.md
23
ChangeLog.md
@@ -5,6 +5,29 @@ This documents notable or significant changes to
|
||||
information about the game from which it was forked, please see the
|
||||
[MegaGlest home page](https://megaglest.org/).
|
||||
|
||||
## 2018-05-08
|
||||
|
||||
OpenBSD build instructions added
|
||||
|
||||
## 2018-05-06
|
||||
|
||||
[[d1acd87](https://github.com/ZetaGlest/zetaglest-source/commit/d1acd8742395bca8b37656e9e8065022902586fe)]Lua
|
||||
can now be used in scripts tag in faction tag within XML
|
||||
|
||||
## 2018-03-31
|
||||
|
||||
[[bugfix:835c6ef](https://github.com/ZetaGlest/zetaglest-source/commit/835c6efd924ed7e62ccd43e064bc6b7f5cdecbfc)]Fixed
|
||||
"x" key getting stuck on Windows
|
||||
|
||||
## 2018-03-20
|
||||
|
||||
[[045b0b8](https://github.com/ZetaGlest/zetaglest-source/commit/045b0b88e051f7163fbef42fa0adc63a326ca186)]Removed "MG_" and "xxx" (3 digit extension) on nicknames in lobby player list
|
||||
|
||||
## 2018-03-14
|
||||
|
||||
[Windows](https://github.com/ZetaGlest/zetaglest-source/commits/develop/mk/windows) build
|
||||
system, dependencies, and documentation updated
|
||||
|
||||
## 2018-02-22
|
||||
|
||||
* Some sound effects can now be customized by players. See
|
||||
|
||||
13
README.md
13
README.md
@@ -21,9 +21,19 @@ 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 >
|
||||
* [](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 >
|
||||
* [](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 >
|
||||
* [](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)
|
||||
|
||||
ZetaGlest forked from MegaGlest at v3.13.0-dev
|
||||
ZetaGlest forked from MegaGlest at v3.13.0-dev ([12998eb](https://github.com/ZetaGlest/zetaglest-source/commit/12998eb10f6447ac89a45d1e6d76f17946647b7a))
|
||||
|
||||
I noticed that there were some good feature requests in the MegaGlest
|
||||
forum, as well as some mods, but it seemed that implementing and
|
||||
@@ -99,4 +109,5 @@ for extended, important instructions and guidelines for contributing.
|
||||
## Contact
|
||||
|
||||
* [Discord](https://discord.gg/WaAaXS7)
|
||||
* [Message Board](https://groups.google.com/forum/#!forum/zetaglest)
|
||||
* email: andy400-dev@yahoo.com
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
The documents in this directory are here for historical purposes and pertain
|
||||
to MegaGlest, not ZetaGlest. To view active documentation for ZetaGlest, see
|
||||
https://github.com/ZetaGlest/zetaglest-source and https://zetaglest.github.io/docs/
|
||||
|
||||
|
||||
MEGAGLEST
|
||||
|
||||
@@ -1,174 +0,0 @@
|
||||
|
||||
MEGAGLEST
|
||||
|
||||
by Titus Tscharntke and Mark Vejvoda
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Build instructions for Linux
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1. Architecture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Developed on Linux with glibc, little endian CPU. While MacIntel builds exist
|
||||
(for some versions of the game), MegaGlest does not currently work on big
|
||||
endian CPUs like PPC (though some unfinished patches for vanilla Glest float
|
||||
around on the forums, e.g. http://forum.megaglest.org/?topic=1426#).
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~ 2. Building and Installation ~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
--- 2.1 Prerequesites ---
|
||||
|
||||
Compiling MegaGlest requires the following dependencies to be installed:
|
||||
|
||||
* Standard GNU compiler and additional tools (g++ version 4.6.3 or later is
|
||||
required at the moment)
|
||||
|
||||
* Kitware CMake 2.8.2 or later (used as build tool)
|
||||
|
||||
* X11 libraries + headers
|
||||
http://x.org/
|
||||
|
||||
* SDL 2.0.0 or later
|
||||
http://libsdl.org/
|
||||
|
||||
* OpenGL
|
||||
http://dri.freedesktop.org/wiki/libGL
|
||||
|
||||
* libvlc
|
||||
http://www.videolan.org/vlc/libvlc.html
|
||||
|
||||
* libcurl
|
||||
http://curl.haxx.se/libcurl/
|
||||
|
||||
* wxWidgets
|
||||
http://wxwidgets.org/
|
||||
|
||||
* OpenAL
|
||||
http://openal.org/
|
||||
|
||||
* Ogg
|
||||
http://xiph.org/ogg/
|
||||
|
||||
* Vorbis
|
||||
http://xiph.org/vorbis/
|
||||
|
||||
* Xerces-C
|
||||
http://xerces.apache.org/xerces-c/
|
||||
|
||||
* Lua 5.1 or later
|
||||
http://www.lua.org/
|
||||
|
||||
* JPEG
|
||||
http://www.ijg.org/
|
||||
|
||||
* PNG
|
||||
http://www.libpng.org/
|
||||
|
||||
* Zlib
|
||||
http://zlib.net/
|
||||
|
||||
* GnuTLS
|
||||
http://www.gnu.org/software/gnutls/
|
||||
|
||||
* ICU
|
||||
http://site.icu-project.org/
|
||||
|
||||
* libdl
|
||||
|
||||
NOTE: A script which tries to install build dependencies on many Linux distros
|
||||
is located in mk/linux/setupBuildDeps.sh
|
||||
|
||||
--- 2.2 Building ---
|
||||
|
||||
To build the game simply invoke the build script:
|
||||
|
||||
../mk/linux/build-mg.sh
|
||||
|
||||
This script manually calls cmake with some optional parameters. Feel free to
|
||||
examine it and build manually using cmake.
|
||||
|
||||
--- 2.3 Installation --
|
||||
|
||||
We provide MojoSetup based installers for Linux and NSIS based installers for
|
||||
Windows. By default, the Linux installers install to your home directory. The
|
||||
Windows installers install to %ProgramFiles% (global system scope).
|
||||
|
||||
There are also community maintained packages available for several Linux and
|
||||
BSD distributions. Please see the website, forums and wiki for details.
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~ 3. Troubleshooting ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
--- General ---
|
||||
* Make sure both the hardware and software of your system match the requirements
|
||||
* If you cannot find what you are looking for on here please check the FAQs
|
||||
(https://docs.megaglest.org/MG/FAQ) before contacting the developers.
|
||||
|
||||
--- Compiling ---
|
||||
* If CMake reports that it cannot find some of the libraries, make sure that
|
||||
the relevant ...-dev(el) packages are also installed (distro-dependent).
|
||||
|
||||
--- Sound/Audio ---
|
||||
* If the game doesn't start because of audio/sound errors:
|
||||
Make sure no other application is using your soundcard. Typical problems are
|
||||
the Gnome/KDE sound dameons esd and artsd. You can kill these daemons with
|
||||
the following commands:
|
||||
# killall esd ; killall artsd
|
||||
|
||||
* If this doesn't solve the sound problems, get an updated OpenAL from
|
||||
http://openal.org or a newer repository provided by your distribution.
|
||||
|
||||
* Sound is played through OpenAL - double-check the OpenAL system
|
||||
configuration: http://supertux.lethargik.org/wiki/OpenAL_Configuration
|
||||
|
||||
--- OpenGL ---
|
||||
* If the game produces error messages regarding OpenGL or OpenGL extensions
|
||||
being unavailable, look at glxinfo and make sure the system is using the
|
||||
drivers you want to use. If you have a NVIDIA or AMD/ATI graphics card then
|
||||
consider using the proprietary drivers, which may provide better
|
||||
performance than the open source drivers most distributions use by default.
|
||||
Most Intel graphics chips use an open source driver on Linux, based on Mesa
|
||||
("glxinfo | grep -i mesa"). This hardware is much slower than any dedicated
|
||||
graphics cards produced during the past few years. The same holds true for
|
||||
AMD APUs (the graphics chips embedded into AMD processors).
|
||||
|
||||
--- Crashing ---
|
||||
* Check the forums at http://forums.megaglest.org/
|
||||
* Please report any crashes and freezes that are not yet described on the forums,
|
||||
preferably with a gdb backtrace from a debugging enabled build
|
||||
(cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo)
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~ 4. More information ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
* Website
|
||||
http://megaglest.org/
|
||||
|
||||
* Wiki
|
||||
https://docs.megaglest.org/Main_Page
|
||||
|
||||
* Forums
|
||||
http://forums.megaglest.org/
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 5. Contact + Credits ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
* MegaGlest is developed by:
|
||||
Titus Tscharntke (info@titusgames.de)
|
||||
Mark Vejvoda (www.soft-haus.com - mark_vejvoda@hotmail.com)
|
||||
|
||||
* General contact:
|
||||
contact@megaglest.org
|
||||
|
||||
* MegaGlest is a fork of Glest:
|
||||
http://glest.org/
|
||||
|
||||
* Linux port by:
|
||||
Matthias Braun
|
||||
<matze@braunis.de>
|
||||
|
||||
with help from
|
||||
|
||||
Karl Robillard
|
||||
<krobbillard@san.rr.com>
|
||||
|
||||
*** Please also refer to the copyright file. ***
|
||||
|
||||
On Debian GNU/Linux systems please find license information in:
|
||||
/usr/share/common-licenses
|
||||
@@ -1,152 +0,0 @@
|
||||
|
||||
MEGAGLEST
|
||||
|
||||
by Titus Tscharntke and Mark Vejvoda
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
Build Instructions for Windows
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1. Architecture ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Developed on Windows with Microsoft Visual Studio Community 2015,
|
||||
little endian CPU. Compiling using the mingw32 toolset is experimental, which
|
||||
also allows for cross compiling.
|
||||
|
||||
On Debian GNU/Linux systems please find license information in:
|
||||
/usr/share/common-licenses
|
||||
Also see Build Instructions for Linux
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~ 2. Building and Installation ~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
--- 2.1 Prerequesites ---
|
||||
|
||||
To build the game, the following tools and libraries must be present:
|
||||
|
||||
- Pick 1:
|
||||
* Microsoft Visual Studio Community 2015
|
||||
https://www.microsoft.com/en-us/download/details.aspx?id=48146
|
||||
(Experimental Microsoft Visual C++ Express 2012 projects also exist in the vc2012
|
||||
folder)
|
||||
* mingw32
|
||||
http://mingw.org/
|
||||
|
||||
- Pick 1:
|
||||
* MegaGlest dependencies for building with VC++, which which will be downloaded
|
||||
automatically in 'Option A' (see below)
|
||||
* MegaGlest Windows 32 bit dependencies for building with mingw:
|
||||
https://github.com/MegaGlest/megaglest-source/releases/download/3.2.3/win32_deps_mingw.7z
|
||||
|
||||
- These include:
|
||||
* Xerces-C
|
||||
http://xerces.apache.org/xerces-c/
|
||||
* wxWidgets
|
||||
http://wxwidgets.org/
|
||||
* And many more. For a more verbose list, please inspect the archive contents and refer to the
|
||||
Linux build instructions.
|
||||
|
||||
|
||||
--- 2.2 Building ---
|
||||
|
||||
To build and install the game proceed as follows:
|
||||
|
||||
*** Option A ~ (recommended) Automated build on the command line:
|
||||
|
||||
1. Open a command prompt and navigate to the root folder where you have acquired the source code.
|
||||
|
||||
2. cd mk\windows
|
||||
|
||||
3. build-mg-2015.bat (or build-mg32bit-2015.bat for 32 bit build)
|
||||
|
||||
4. megaglest.exe --version
|
||||
|
||||
5. megaglest.exe
|
||||
|
||||
*** Option B ~ Using VC++ IDE:
|
||||
|
||||
1. Download the dependencies archive (which one and from where you can find
|
||||
out in the "code" of build-...bat script from 'Option A' approach, some line
|
||||
with "wget.exe") and decompress its contents into the 'source' directory. This
|
||||
should create a subdirectory called "windows_deps..." with many files and
|
||||
subdirectories in it.
|
||||
|
||||
2. Start the Visual C++ 2015 IDE and open the solution file:
|
||||
\mk\windows\Glest_vc2015.sln
|
||||
|
||||
3. Right Click on the top level 'Glest' node in Solution Explorer and select
|
||||
'Rebuild All' (choose release mode or release with debug info).
|
||||
|
||||
Note: If you had no errors all binaries will be created.
|
||||
Before running MegaGlest you must run CopyWindowsRuntimeDlls_2015.bat.
|
||||
You should now be able to just run megaglest.exe.
|
||||
|
||||
|
||||
--- 2.3 Installation ---
|
||||
|
||||
We provide NSIS based installation packages. By default, these will create a
|
||||
system-wide installation below %ProgramFiles% and setup Desktop icons for
|
||||
simplified access. User specific configuration will be stored within the
|
||||
directory tree the %AppData% environment variable points to.
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 3. Troubleshooting ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
--- General ---
|
||||
* Make sure that the hardware and software of your system match the
|
||||
requirements
|
||||
|
||||
* If you cannot find what you are looking for on here please check the FAQs
|
||||
(https://docs.megaglest.org/MG/FAQ) before contacting.
|
||||
|
||||
--- Compiling ---
|
||||
* If configure fails make sure you have read the Building section above
|
||||
|
||||
--- Sound/Audio errors when starting ---
|
||||
* If the game doesn't start because of audio/sound errors:
|
||||
Make sure no other application is using your soundcard.
|
||||
* If this doesn't solve your sound problems try to get an updated OpenAL from
|
||||
http://openal.org
|
||||
* Sound is played through OpenAL - you might need to take a look at your
|
||||
configuration: http://supertux.lethargik.org/wiki/OpenAL_Configuration
|
||||
|
||||
--- The game complains that OpenGL 1.3: is not available, is missing OpenGL
|
||||
extensions, or works very slowly ---
|
||||
* Try to get updated graphics drivers.
|
||||
|
||||
-- The game crashes ---
|
||||
* Check the forums at http://forums.megaglest.org/
|
||||
* Please report any other crashes and freezes that are not yet described on
|
||||
the forums, preferably with a backtrace from a debugging enabled build
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~ 4. More information ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
* Website
|
||||
http://megaglest.org/
|
||||
|
||||
* Wiki
|
||||
https://docs.megaglest.org/Main_Page
|
||||
|
||||
* Forums
|
||||
http://forums.megaglest.org/
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 5. Contact + Credits ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
* MegaGlest is developed by:
|
||||
Titus Tscharntke (info@titusgames.de)
|
||||
Mark Vejvoda (www.soft-haus.com - mark_vejvoda@hotmail.com)
|
||||
|
||||
* General contact:
|
||||
contact@megaglest.org
|
||||
|
||||
* MegaGlest is a fork of Glest:
|
||||
http://glest.org/
|
||||
|
||||
* Linux port by:
|
||||
Matthias Braun
|
||||
<matze@braunis.de>
|
||||
|
||||
with help from
|
||||
|
||||
Karl Robillard
|
||||
<krobbillard@san.rr.com>
|
||||
|
||||
*** Please also refer to the copyright file. ***
|
||||
@@ -8,7 +8,7 @@
|
||||
#
|
||||
|
||||
IF(WANT_STATIC_LIBS)
|
||||
IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST)
|
||||
IF(BUILD_ZETAGLEST_MODEL_VIEWER OR BUILD_ZETAGLEST_MAP_EDITOR OR BUILD_ZETAGLEST)
|
||||
# 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_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR)
|
||||
IF(BUILD_ZETAGLEST_MODEL_VIEWER OR BUILD_ZETAGLEST_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_MEGAGLEST)
|
||||
IF(BUILD_ZETAGLEST)
|
||||
# only libs not used by shared lib
|
||||
FOREACH(STATIC_LIB
|
||||
OGG)
|
||||
|
||||
8
mk/linux/.gitignore
vendored
8
mk/linux/.gitignore
vendored
@@ -1,7 +1,9 @@
|
||||
/megaglest
|
||||
/megaglest.6
|
||||
/zetaglest
|
||||
/zetaglest.6
|
||||
/zetaglest_editor*
|
||||
/zetaglest_g3dviewer*
|
||||
/zetaglest_tests
|
||||
|
||||
/megaglest_*
|
||||
!/*.desktop
|
||||
|
||||
core
|
||||
|
||||
@@ -25,7 +25,7 @@ GCC_FORCED_VERSION=0
|
||||
LUA_FORCED_VERSION=0
|
||||
FORCE_32BIT_CROSS_COMPILE=0
|
||||
COMPILATION_WITHOUT=0
|
||||
BUILD_MEGAGLEST_TESTS="ON"
|
||||
BUILD_ZETAGLEST_TESTS="ON"
|
||||
|
||||
while getopts "c:defg:hl:mnswx" option; do
|
||||
case "${option}" in
|
||||
@@ -189,14 +189,14 @@ case $distribution in
|
||||
echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT'
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_FTGL=OFF -DSTATIC_LUA=OFF -DSTATIC_JPEG=OFF -DSTATIC_PNG=OFF -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON"
|
||||
fi
|
||||
if [ $CLANG_FORCED = 1 ]; then BUILD_MEGAGLEST_TESTS="OFF"; fi
|
||||
if [ $CLANG_FORCED = 1 ]; then BUILD_ZETAGLEST_TESTS="OFF"; fi
|
||||
;;
|
||||
*)
|
||||
if [ "$WANT_STATIC_LIBS" = "-DWANT_STATIC_LIBS=ON" ]; then
|
||||
echo 'Turning ON dynamic OGG ... and forcing use the embedded IRCCLIENT'
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DSTATIC_OGG=OFF -DFORCE_USE_EMBEDDED_Ircclient=ON"
|
||||
fi
|
||||
if [ $CLANG_FORCED = 1 ]; then BUILD_MEGAGLEST_TESTS="OFF"; fi
|
||||
if [ $CLANG_FORCED = 1 ]; then BUILD_ZETAGLEST_TESTS="OFF"; fi
|
||||
# ^ may be removed ~ when default clang's version will be 3.9+
|
||||
;;
|
||||
esac
|
||||
@@ -311,12 +311,12 @@ if [ $FORCE_32BIT_CROSS_COMPILE != 0 ]; then
|
||||
fi
|
||||
|
||||
if [ "$COMPILATION_WITHOUT" != "0" ] && [ "$COMPILATION_WITHOUT" != "" ]; then
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_MEGAGLEST_MAP_EDITOR=OFF -DBUILD_MEGAGLEST_MODEL_VIEWER=OFF"
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_ZETAGLEST_MAP_EDITOR=OFF -DBUILD_ZETAGLEST_MODEL_VIEWER=OFF"
|
||||
fi
|
||||
|
||||
if [ $MAKE_ONLY = 0 ]; then
|
||||
echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS} AND WANT_STATIC_LIBS = ${WANT_STATIC_LIBS}"
|
||||
cmake -DCMAKE_INSTALL_PREFIX='' -DWANT_DEV_OUTPATH=ON $WANT_STATIC_LIBS -DBUILD_MEGAGLEST_TESTS=$BUILD_MEGAGLEST_TESTS -DBREAKPAD_ROOT=$BREAKPAD_ROOT $EXTRA_CMAKE_OPTIONS ../../..
|
||||
cmake -DCMAKE_INSTALL_PREFIX='' -DWANT_DEV_OUTPATH=ON $WANT_STATIC_LIBS -DBUILD_ZETAGLEST_TESTS=$BUILD_ZETAGLEST_TESTS -DBREAKPAD_ROOT=$BREAKPAD_ROOT $EXTRA_CMAKE_OPTIONS ../../..
|
||||
if [ $? -ne 0 ]; then
|
||||
echo 'ERROR: CMAKE failed.' >&2; exit 1
|
||||
fi
|
||||
|
||||
@@ -37,7 +37,7 @@ include (InstallRequiredSystemLibraries)
|
||||
# Use bundle generator (OSX has 3 other options if you feel adventurous)
|
||||
SET(CPACK_GENERATOR "Bundle")
|
||||
SET(CPACK_BUNDLE_NAME "MegaGlest")
|
||||
SET(CPACK_PACKAGE_FILE_NAME "MegaGlest-game-macos-${MEGAGLEST_VERSION}")
|
||||
SET(CPACK_PACKAGE_FILE_NAME "MegaGlest-game-macos-${ZETAGLEST_VERSION}")
|
||||
SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns")
|
||||
SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns")
|
||||
SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.sh")
|
||||
|
||||
@@ -191,7 +191,7 @@ if [ "$FORCE_EMBEDDED_LIBS" != "0" ] && [ "$FORCE_EMBEDDED_LIBS" != "" ]; then
|
||||
fi
|
||||
|
||||
if [ "$COMPILATION_WITHOUT" != "0" ] && [ "$COMPILATION_WITHOUT" != "" ]; then
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_MEGAGLEST_MAP_EDITOR=OFF -DBUILD_MEGAGLEST_MODEL_VIEWER=OFF"
|
||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_ZETAGLEST_MAP_EDITOR=OFF -DBUILD_ZETAGLEST_MODEL_VIEWER=OFF"
|
||||
fi
|
||||
|
||||
if [ "$MAKE_ONLY" -eq "0" ]; then
|
||||
@@ -200,7 +200,7 @@ 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_MEGAGLEST_TESTS=ON"
|
||||
#EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DBUILD_ZETAGLEST_TESTS=ON"
|
||||
#^ Uncomment when it will start working on clang
|
||||
else
|
||||
rm -f ../zetaglest_tests
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>MegaGlest</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>v${MEGAGLEST_VERSION}, © 2018 The ZetaGlest Team.</string>
|
||||
<string>v${ZETAGLEST_VERSION}, © 2018 The ZetaGlest Team.</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>MegaGlest</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.megaglest.v${MEGAGLEST_VERSION}</string>
|
||||
<string>org.megaglest.v${ZETAGLEST_VERSION}</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
||||
@@ -1,674 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||
@@ -1,5 +1,4 @@
|
||||
# Windows
|
||||
ZetaGlest build system for Windows
|
||||
# Build ZetaGlest for Windows
|
||||
|
||||
**To build ZetaGlest for the first time:**
|
||||
|
||||
@@ -34,16 +33,20 @@ To be able to run ZetaGlest from within Visual Studio using the debugger, you ne
|
||||
2. Right-click `glest_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", otherwise it won't compile, but one can still use debugging options by making the following changes in the project properties:
|
||||
Configuration in Visual Studio **must be left as `Release`**, and it must match the project architecture as otherwise it won't compile. The settings involved are the following:
|
||||
|
||||
Debug:
|
||||
|
||||
|
||||
Although the configuration *must be set as `Release`*, one can still use debugging options by making the following changes in the project properties.
|
||||
|
||||
To manually emulate `Debug`:
|
||||
|
||||
Inline Function Expansion: Disabled
|
||||
Enable Intrinsic Functions: No
|
||||
Favor Size Or Speed: Neither
|
||||
Preprocessor: DEBUG instead of NDEBUG
|
||||
|
||||
Release:
|
||||
To manually emulate `Release`:
|
||||
|
||||
Inline Function Expansion: Any Suitable
|
||||
Enable Intrinsic Functions: Yes
|
||||
|
||||
@@ -162,5 +162,13 @@ Echo Building ZetaGlest...
|
||||
cd .\%FOLDER_NAME%\
|
||||
msbuild.exe /p:Configuration=%MSBUILD_CONFIG%;Platform=%PLATFORM%;PlatformToolset=%TOOLSET% ZetaGlest.sln
|
||||
cd ..\
|
||||
ECHO.
|
||||
ECHO Copying binaries...
|
||||
ECHO.
|
||||
call .\group-binaries.bat
|
||||
ECHO ... Done.
|
||||
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.
|
||||
pause
|
||||
@@ -39,6 +39,12 @@ IF EXIST .\vs2017-64 (
|
||||
cd ..\
|
||||
)
|
||||
|
||||
IF EXIST .\bin (
|
||||
cd .\bin
|
||||
CALL :DELETE
|
||||
cd ..\
|
||||
)
|
||||
|
||||
ROBOCOPY . . /S /MOVE
|
||||
ROBOCOPY . . /S /MOVE
|
||||
ROBOCOPY . . /S /MOVE
|
||||
|
||||
@@ -33,6 +33,12 @@ IF EXIST .\vs2017-64 (
|
||||
cd ..\
|
||||
)
|
||||
|
||||
IF EXIST .\bin (
|
||||
cd .\bin
|
||||
CALL :DELETE
|
||||
cd ..\
|
||||
)
|
||||
|
||||
ROBOCOPY . . /S /MOVE
|
||||
ROBOCOPY . . /S /MOVE
|
||||
ROBOCOPY . . /S /MOVE
|
||||
|
||||
37
mk/windows/group-binaries.bat
Normal file
37
mk/windows/group-binaries.bat
Normal file
@@ -0,0 +1,37 @@
|
||||
@echo off
|
||||
md bin
|
||||
md bin\vs2015
|
||||
md bin\vs2017
|
||||
|
||||
copy /y 7z.dll bin\vs2015\7z.dll
|
||||
copy /y 7z.dll bin\vs2017\7z.dll
|
||||
|
||||
copy /y 7z.exe bin\vs2015\7z.exe
|
||||
copy /y 7z.exe bin\vs2017\7z.exe
|
||||
|
||||
copy /y glest.ini bin\vs2015\glest.ini
|
||||
copy /y glest.ini bin\vs2017\glest.ini
|
||||
|
||||
copy /y ..\shared\glestkeys.ini bin\vs2015\glestkeys.ini
|
||||
copy /y ..\shared\glestkeys.ini bin\vs2017\glestkeys.ini
|
||||
|
||||
copy /y ..\shared\servers.ini bin\vs2015\servers.ini
|
||||
copy /y ..\shared\servers.ini bin\vs2017\servers.ini
|
||||
|
||||
copy /y vs2015-32\g3dviewerWin32\Release\g3dviewer.exe bin\vs2015\g3dviewer-32.exe
|
||||
copy /y vs2017-32\g3dviewerWin32\Release\g3dviewer.exe bin\vs2017\g3dviewer-32.exe
|
||||
|
||||
copy /y vs2015-32\map_editorWin32\Release\map_editor.exe bin\vs2015\map_editor-32.exe
|
||||
copy /y vs2017-32\map_editorWin32\Release\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-64\g3dviewerx64\Release\g3dviewer.exe bin\vs2015\g3dviewer-64.exe
|
||||
copy /y vs2017-64\g3dviewerx64\Release\g3dviewer.exe bin\vs2017\g3dviewer-64.exe
|
||||
|
||||
copy /y vs2015-64\map_editorx64\Release\map_editor.exe bin\vs2015\map_editor-64.exe
|
||||
copy /y vs2017-64\map_editorx64\Release\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
|
||||
4
mk/windows/vs2015-32/.gitignore
vendored
4
mk/windows/vs2015-32/.gitignore
vendored
@@ -17,4 +17,6 @@
|
||||
*.ipch
|
||||
*.pch
|
||||
*.ini
|
||||
*.obj
|
||||
*.obj
|
||||
*.res
|
||||
*.user
|
||||
@@ -5,13 +5,13 @@ VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_game", "glest_game.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map_editor", "map_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
|
||||
EndProject
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
@@ -70,8 +70,8 @@
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -12,9 +12,9 @@
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{FE5C7C7C-F109-44F5-8329-25A4E24F162C}</ProjectGuid>
|
||||
<RootNamespace>g3d_viewer</RootNamespace>
|
||||
<RootNamespace>g3dviewer</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectName>g3d_viewer</ProjectName>
|
||||
<ProjectName>g3dviewer</ProjectName>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
@@ -161,7 +161,7 @@
|
||||
<ClCompile>
|
||||
<AdditionalOptions>/arch:SSE2 %(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>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -261,9 +261,9 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<wxWidgets>$(SolutionDir)\..\dependencies\src\wxwidgets</wxWidgets>
|
||||
<LIBTYPE_SUFFIX>lib</LIBTYPE_SUFFIX>
|
||||
<BuildwxWidgets>true</BuildwxWidgets>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -158,7 +158,7 @@
|
||||
<ClCompile>
|
||||
<AdditionalOptions>/arch:SSE2 %(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>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -250,9 +250,9 @@
|
||||
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="libglest.vcxproj">
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -12,8 +12,8 @@
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
|
||||
<RootNamespace>glest_game</RootNamespace>
|
||||
<ProjectName>glest_game</ProjectName>
|
||||
<RootNamespace>zetaglest</RootNamespace>
|
||||
<ProjectName>zetaglest</ProjectName>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
Binary file not shown.
4
mk/windows/vs2015-64/.gitignore
vendored
4
mk/windows/vs2015-64/.gitignore
vendored
@@ -17,4 +17,6 @@
|
||||
*.ipch
|
||||
*.pch
|
||||
*.ini
|
||||
*.obj
|
||||
*.obj
|
||||
*.res
|
||||
*.user
|
||||
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_game", "glest_game.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
|
||||
EndProject
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -239,7 +239,7 @@
|
||||
<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>
|
||||
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -331,9 +331,9 @@
|
||||
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="libglest.vcxproj">
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -1,7 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LocalDebuggerWorkingDirectory>$(SolutionDir)$(TargetName)\</LocalDebuggerWorkingDirectory>
|
||||
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<wxWidgets>$(SolutionDir)\..\dependencies\src\wxwidgets</wxWidgets>
|
||||
<LIBTYPE_SUFFIX>lib</LIBTYPE_SUFFIX>
|
||||
<BuildwxWidgets>true</BuildwxWidgets>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -234,7 +234,7 @@
|
||||
<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>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -324,9 +324,9 @@
|
||||
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="libglest.vcxproj">
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -12,8 +12,8 @@
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
|
||||
<RootNamespace>glest_game</RootNamespace>
|
||||
<ProjectName>glest_game</ProjectName>
|
||||
<RootNamespace>zetaglest</RootNamespace>
|
||||
<ProjectName>zetaglest</ProjectName>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
Binary file not shown.
4
mk/windows/vs2017-32/.gitignore
vendored
4
mk/windows/vs2017-32/.gitignore
vendored
@@ -17,4 +17,6 @@
|
||||
*.ipch
|
||||
*.pch
|
||||
*.ini
|
||||
*.obj
|
||||
*.obj
|
||||
*.res
|
||||
*.user
|
||||
@@ -5,13 +5,13 @@ VisualStudioVersion = 15.0.27130.2036
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_game", "glest_game.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map_editor", "map_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
|
||||
EndProject
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -12,9 +12,9 @@
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{FE5C7C7C-F109-44F5-8329-25A4E24F162C}</ProjectGuid>
|
||||
<RootNamespace>g3d_viewer</RootNamespace>
|
||||
<RootNamespace>g3dviewer</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectName>g3d_viewer</ProjectName>
|
||||
<ProjectName>g3dviewer</ProjectName>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
@@ -161,7 +161,7 @@
|
||||
<ClCompile>
|
||||
<AdditionalOptions>/arch:SSE2 %(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>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -256,9 +256,9 @@
|
||||
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="libglest.vcxproj">
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<wxWidgets>$(SolutionDir)\..\dependencies\src\wxwidgets</wxWidgets>
|
||||
<LIBTYPE_SUFFIX>lib</LIBTYPE_SUFFIX>
|
||||
<BuildwxWidgets>true</BuildwxWidgets>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -158,7 +158,7 @@
|
||||
<ClCompile>
|
||||
<AdditionalOptions>/arch:SSE2 %(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>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -250,9 +250,9 @@
|
||||
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="libglest.vcxproj">
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -12,8 +12,8 @@
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
|
||||
<RootNamespace>glest_game</RootNamespace>
|
||||
<ProjectName>glest_game</ProjectName>
|
||||
<RootNamespace>zetaglest</RootNamespace>
|
||||
<ProjectName>zetaglest</ProjectName>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
Binary file not shown.
4
mk/windows/vs2017-64/.gitignore
vendored
4
mk/windows/vs2017-64/.gitignore
vendored
@@ -17,4 +17,6 @@
|
||||
*.ipch
|
||||
*.pch
|
||||
*.ini
|
||||
*.obj
|
||||
*.obj
|
||||
*.res
|
||||
*.user
|
||||
@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.27130.2036
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglest", "libglest.vcxproj", "{8DAA0C24-95CD-4F66-B4C5-19ABDD771746}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_game", "glest_game.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zetaglest", "zetaglest.vcxproj", "{6B0C65F1-D031-46AF-AC0D-7C38892D2952}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
|
||||
EndProject
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Full</Optimization>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -239,7 +239,7 @@
|
||||
<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>
|
||||
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -331,9 +331,9 @@
|
||||
<ClCompile Include="..\..\..\source\glest_game\graphics\unit_particle_type.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="libglest.vcxproj">
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<wxWidgets>$(SolutionDir)\..\dependencies\src\wxwidgets</wxWidgets>
|
||||
<LIBTYPE_SUFFIX>lib</LIBTYPE_SUFFIX>
|
||||
<BuildwxWidgets>true</BuildwxWidgets>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
@@ -234,7 +234,7 @@
|
||||
<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>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_WINDOWS;WIN32;NDEBUG;CURL_STATICLIB;UNICODE;_UNICODE;GLEW_STATIC;ZLIB_WINAPI;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@@ -324,9 +324,9 @@
|
||||
<ClCompile Include="..\..\..\source\glest_map_editor\program.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="..\glest.ini">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="libglest.vcxproj">
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Binary file not shown.
@@ -12,8 +12,8 @@
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{6B0C65F1-D031-46AF-AC0D-7C38892D2952}</ProjectGuid>
|
||||
<RootNamespace>glest_game</RootNamespace>
|
||||
<ProjectName>glest_game</ProjectName>
|
||||
<RootNamespace>zetaglest</RootNamespace>
|
||||
<ProjectName>zetaglest</ProjectName>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
Binary file not shown.
BIN
rss_23x23.jpeg
Normal file
BIN
rss_23x23.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 690 B |
@@ -4,7 +4,7 @@ SET(EXTERNAL_LIBS "")
|
||||
SET(TARGET_NAME "zetaglest_g3dviewer")
|
||||
SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6")
|
||||
|
||||
IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
||||
IF(BUILD_ZETAGLEST_MODEL_VIEWER)
|
||||
MESSAGE(STATUS "Will try to build ZetaGlest model viewer")
|
||||
|
||||
IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
|
||||
@@ -187,7 +187,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
||||
ENDFOREACH(DIR)
|
||||
|
||||
IF(WANT_DEV_OUTPATH)
|
||||
SET(EXECUTABLE_OUTPUT_PATH "${MEGAGLEST_FRIENDLY_OUTPUT_PATH}")
|
||||
SET(EXECUTABLE_OUTPUT_PATH "${ZETAGLEST_FRIENDLY_OUTPUT_PATH}")
|
||||
ENDIF()
|
||||
|
||||
SET(HELP2MAN_OUT_PATH ${EXECUTABLE_OUTPUT_PATH})
|
||||
@@ -234,20 +234,20 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
||||
# Installation of the program
|
||||
INSTALL(TARGETS
|
||||
${TARGET_NAME}
|
||||
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_BIN_INSTALL_PATH})
|
||||
|
||||
IF(EXISTS ${HELP2MAN} AND NOT "${MEGAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
|
||||
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")
|
||||
IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
|
||||
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]")
|
||||
|
||||
# Installation of the program manpage file
|
||||
INSTALL(FILES
|
||||
"${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}"
|
||||
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_MANPAGE_INSTALL_PATH})
|
||||
ENDIF()
|
||||
|
||||
# Installation of the program config and image files
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/shared/g3dviewer.ico"
|
||||
DESTINATION ${MEGAGLEST_INI_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_INI_INSTALL_PATH})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,8 +13,8 @@
|
||||
#define _SHADER_G3DVIEWER_MAIN_H_
|
||||
|
||||
#ifdef WIN32
|
||||
#include <winsock2.h>
|
||||
#include <winsock.h>
|
||||
#include <winsock2.h>
|
||||
#include <winsock.h>
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
@@ -32,203 +32,208 @@
|
||||
using std::string;
|
||||
using namespace Glest::Game;
|
||||
|
||||
namespace Shared{ namespace G3dViewer{
|
||||
namespace Shared {
|
||||
namespace G3dViewer {
|
||||
|
||||
class GlCanvas;
|
||||
class GlCanvas;
|
||||
|
||||
// ===============================
|
||||
// class MainWindow
|
||||
// ===============================
|
||||
// ===============================
|
||||
// class MainWindow
|
||||
// ===============================
|
||||
|
||||
class MainWindow: public wxFrame{
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
class MainWindow : public wxFrame {
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
public:
|
||||
static const string versionString;
|
||||
static const string winHeader;
|
||||
public:
|
||||
static const string versionString;
|
||||
static const string winHeader;
|
||||
|
||||
enum MenuId{
|
||||
miFileLoad,
|
||||
miFileLoadParticleXML,
|
||||
miFileLoadProjectileParticleXML,
|
||||
miFileLoadSplashParticleXML,
|
||||
miFileClearAll,
|
||||
miFileToggleScreenshotTransparent,
|
||||
miFileSaveScreenshot,
|
||||
miModeWireframe,
|
||||
miModeNormals,
|
||||
miModeGrid,
|
||||
miSpeedSlower,
|
||||
miSpeedFaster,
|
||||
miRestart,
|
||||
miChangeBackgroundColor,
|
||||
miColorRed,
|
||||
miColorBlue,
|
||||
miColorGreen,
|
||||
miColorYellow,
|
||||
miColorWhite,
|
||||
miColorCyan,
|
||||
miColorOrange,
|
||||
miColorMagenta
|
||||
};
|
||||
enum MenuId {
|
||||
miFileLoad,
|
||||
miFileLoadParticleXML,
|
||||
miFileLoadProjectileParticleXML,
|
||||
miFileLoadSplashParticleXML,
|
||||
miFileClearAll,
|
||||
miFileToggleScreenshotTransparent,
|
||||
miFileSaveScreenshot,
|
||||
miModeWireframe,
|
||||
miModeNormals,
|
||||
miModeGrid,
|
||||
miSpeedSlower,
|
||||
miSpeedFaster,
|
||||
miRestart,
|
||||
miChangeBackgroundColor,
|
||||
miColorRed,
|
||||
miColorBlue,
|
||||
miColorGreen,
|
||||
miColorYellow,
|
||||
miColorWhite,
|
||||
miColorCyan,
|
||||
miColorOrange,
|
||||
miColorMagenta
|
||||
};
|
||||
|
||||
private:
|
||||
GlCanvas *glCanvas;
|
||||
Renderer *renderer;
|
||||
private:
|
||||
GlCanvas *glCanvas;
|
||||
Renderer *renderer;
|
||||
|
||||
wxTimer *timer;
|
||||
wxTimer *timer;
|
||||
|
||||
wxMenuBar *menu;
|
||||
wxMenu *menuFile;
|
||||
wxMenu *menuMode;
|
||||
wxMenu *menuSpeed;
|
||||
wxMenu *menuCustomColor;
|
||||
wxFileDialog *fileDialog;
|
||||
wxMenuBar *menu;
|
||||
wxMenu *menuFile;
|
||||
wxMenu *menuMode;
|
||||
wxMenu *menuSpeed;
|
||||
wxMenu *menuCustomColor;
|
||||
wxFileDialog *fileDialog;
|
||||
|
||||
wxColourDialog *colorPicker;
|
||||
wxColourDialog *colorPicker;
|
||||
|
||||
Model *model;
|
||||
Model *model;
|
||||
|
||||
std::pair<string,vector<string> > unitPath;
|
||||
std::vector<string> modelPathList;
|
||||
std::vector<string> particlePathList;
|
||||
std::vector<string> particleProjectilePathList;
|
||||
std::vector<string> particleSplashPathList; // as above
|
||||
std::pair<string, vector<string> > unitPath;
|
||||
std::vector<string> modelPathList;
|
||||
std::vector<string> particlePathList;
|
||||
std::vector<string> particleProjectilePathList;
|
||||
std::vector<string> particleSplashPathList; // as above
|
||||
|
||||
bool resetAnimation;
|
||||
float resetAnim;
|
||||
int resetParticleLoopStart;
|
||||
bool resetAnimation;
|
||||
float resetAnim;
|
||||
int resetParticleLoopStart;
|
||||
|
||||
float speed;
|
||||
float anim;
|
||||
float lastanim;
|
||||
int particleLoopStart;
|
||||
float rotX, rotY, zoom;
|
||||
float backBrightness, gridBrightness, lightBrightness;
|
||||
int lastX, lastY;
|
||||
Renderer::PlayerColor playerColor;
|
||||
bool initTextureManager;
|
||||
float speed;
|
||||
float anim;
|
||||
float lastanim;
|
||||
int particleLoopStart;
|
||||
float rotX, rotY, zoom;
|
||||
float backBrightness, gridBrightness, lightBrightness;
|
||||
int lastX, lastY;
|
||||
Renderer::PlayerColor playerColor;
|
||||
bool initTextureManager;
|
||||
|
||||
std::vector<UnitParticleSystemType *> unitParticleSystemTypes;
|
||||
std::vector<UnitParticleSystem *> unitParticleSystems;
|
||||
std::vector<UnitParticleSystemType *> unitParticleSystemTypes;
|
||||
std::vector<UnitParticleSystem *> unitParticleSystems;
|
||||
|
||||
std::vector<ParticleSystemTypeProjectile *> projectileParticleSystemTypes;
|
||||
std::vector<ProjectileParticleSystem *> projectileParticleSystems;
|
||||
std::vector<ParticleSystemTypeSplash *> splashParticleSystemTypes; // as above
|
||||
std::vector<SplashParticleSystem *> splashParticleSystems;
|
||||
string statusbarText;
|
||||
std::vector<ParticleSystemTypeProjectile *> projectileParticleSystemTypes;
|
||||
std::vector<ProjectileParticleSystem *> projectileParticleSystems;
|
||||
std::vector<ParticleSystemTypeSplash *> splashParticleSystemTypes; // as above
|
||||
std::vector<SplashParticleSystem *> splashParticleSystems;
|
||||
string statusbarText;
|
||||
|
||||
bool isControlKeyPressed;
|
||||
bool isControlKeyPressed;
|
||||
|
||||
string appPath;
|
||||
string appPath;
|
||||
|
||||
bool startupSettingsInited;
|
||||
bool startupSettingsInited;
|
||||
|
||||
void initGlCanvas();
|
||||
void loadUnit(string path, string skillName);
|
||||
void loadModel(string path);
|
||||
void loadParticle(string path);
|
||||
void loadProjectileParticle(string path);
|
||||
void loadSplashParticle(string path);
|
||||
void initGlCanvas();
|
||||
void loadUnit(string path, string skillName);
|
||||
void loadModel(string path);
|
||||
void loadParticle(string path);
|
||||
void loadProjectileParticle(string path);
|
||||
void loadSplashParticle(string path);
|
||||
|
||||
void saveScreenshot();
|
||||
void saveScreenshot();
|
||||
|
||||
public:
|
||||
MainWindow( std::pair<string,vector<string> > unitToLoad,
|
||||
const string modelPath,const string particlePath,
|
||||
const string projectileParticlePath,const string splashParticlePath,
|
||||
float defaultAnimation,int defaultParticleLoopStart,
|
||||
float defaultZoom,float defaultXRot, float defaultYRot,
|
||||
public:
|
||||
MainWindow(std::pair<string, vector<string> > unitToLoad,
|
||||
const string modelPath, const string particlePath,
|
||||
const string projectileParticlePath, const string splashParticlePath,
|
||||
float defaultAnimation, int defaultParticleLoopStart,
|
||||
float defaultZoom, float defaultXRot, float defaultYRot,
|
||||
string appPath);
|
||||
~MainWindow();
|
||||
void init();
|
||||
~MainWindow();
|
||||
void init();
|
||||
|
||||
void Notify();
|
||||
void Notify();
|
||||
|
||||
void onPaint(wxPaintEvent &event);
|
||||
void onClose(wxCloseEvent &event);
|
||||
void onMenuFileLoad(wxCommandEvent &event);
|
||||
void onMenuFileLoadParticleXML(wxCommandEvent &event);
|
||||
void onMenuFileLoadProjectileParticleXML(wxCommandEvent &event);
|
||||
void onMenuFileLoadSplashParticleXML(wxCommandEvent &event);
|
||||
void onMenuFileClearAll(wxCommandEvent &event);
|
||||
void onMenumFileToggleScreenshotTransparent(wxCommandEvent &event);
|
||||
void onMenuFileSaveScreenshot(wxCommandEvent &event);
|
||||
void onMenuFileExit(wxCommandEvent &event);
|
||||
void onMenuModeNormals(wxCommandEvent &event);
|
||||
void onMenuModeWireframe(wxCommandEvent &event);
|
||||
void onMenuModeGrid(wxCommandEvent &event);
|
||||
void onMenuSpeedSlower(wxCommandEvent &event);
|
||||
void onMenuSpeedFaster(wxCommandEvent &event);
|
||||
void onMenuRestart(wxCommandEvent &event);
|
||||
void OnChangeColor(wxCommandEvent &event);
|
||||
void onMenuColorRed(wxCommandEvent &event);
|
||||
void onMenuColorBlue(wxCommandEvent &event);
|
||||
void onMenuColorGreen(wxCommandEvent &event);
|
||||
void onMenuColorYellow(wxCommandEvent &event);
|
||||
void onMenuColorWhite(wxCommandEvent &event);
|
||||
void onMenuColorCyan(wxCommandEvent &event);
|
||||
void onMenuColorOrange(wxCommandEvent &event);
|
||||
void onMenuColorMagenta(wxCommandEvent &event);
|
||||
void onMouseWheelDown(wxMouseEvent &event);
|
||||
void onMouseWheelUp(wxMouseEvent &event);
|
||||
void onMouseMove(wxMouseEvent &event);
|
||||
void onTimer(wxTimerEvent &event);
|
||||
void onPaint(wxPaintEvent &event);
|
||||
void onClose(wxCloseEvent &event);
|
||||
void onMenuFileLoad(wxCommandEvent &event);
|
||||
void onMenuFileLoadParticleXML(wxCommandEvent &event);
|
||||
void onMenuFileLoadProjectileParticleXML(wxCommandEvent &event);
|
||||
void onMenuFileLoadSplashParticleXML(wxCommandEvent &event);
|
||||
void onMenuFileClearAll(wxCommandEvent &event);
|
||||
void onMenumFileToggleScreenshotTransparent(wxCommandEvent &event);
|
||||
void onMenuFileSaveScreenshot(wxCommandEvent &event);
|
||||
void onMenuFileExit(wxCommandEvent &event);
|
||||
void onMenuModeNormals(wxCommandEvent &event);
|
||||
void onMenuModeWireframe(wxCommandEvent &event);
|
||||
void onMenuModeGrid(wxCommandEvent &event);
|
||||
void onMenuSpeedSlower(wxCommandEvent &event);
|
||||
void onMenuSpeedFaster(wxCommandEvent &event);
|
||||
void onMenuRestart(wxCommandEvent &event);
|
||||
void OnChangeColor(wxCommandEvent &event);
|
||||
void onMenuColorRed(wxCommandEvent &event);
|
||||
void onMenuColorBlue(wxCommandEvent &event);
|
||||
void onMenuColorGreen(wxCommandEvent &event);
|
||||
void onMenuColorYellow(wxCommandEvent &event);
|
||||
void onMenuColorWhite(wxCommandEvent &event);
|
||||
void onMenuColorCyan(wxCommandEvent &event);
|
||||
void onMenuColorOrange(wxCommandEvent &event);
|
||||
void onMenuColorMagenta(wxCommandEvent &event);
|
||||
void onMouseWheelDown(wxMouseEvent &event);
|
||||
void onMouseWheelUp(wxMouseEvent &event);
|
||||
void onMouseMove(wxMouseEvent &event);
|
||||
void onTimer(wxTimerEvent &event);
|
||||
|
||||
void onKeyDown(wxKeyEvent &e);
|
||||
void onKeyDown(wxKeyEvent &e);
|
||||
|
||||
string getModelInfo();
|
||||
string getModelInfo();
|
||||
|
||||
void setupTimer();
|
||||
void setupStartupSettings();
|
||||
};
|
||||
void setupTimer();
|
||||
void setupStartupSettings();
|
||||
};
|
||||
|
||||
// =====================================================
|
||||
// class GlCanvas
|
||||
// =====================================================
|
||||
// =====================================================
|
||||
// class GlCanvas
|
||||
// =====================================================
|
||||
|
||||
class GlCanvas: public wxGLCanvas {
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
class GlCanvas : public wxGLCanvas {
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
|
||||
public:
|
||||
GlCanvas(MainWindow *mainWindow, int *args);
|
||||
~GlCanvas();
|
||||
public:
|
||||
GlCanvas(MainWindow *mainWindow, int *args);
|
||||
~GlCanvas();
|
||||
|
||||
void onMouseWheel(wxMouseEvent &event);
|
||||
void onMouseMove(wxMouseEvent &event);
|
||||
void onPaint(wxPaintEvent &event);
|
||||
void onKeyDown(wxKeyEvent &event);
|
||||
void OnSize(wxSizeEvent&);
|
||||
void setCurrentGLContext();
|
||||
void onMouseWheel(wxMouseEvent &event);
|
||||
void onMouseMove(wxMouseEvent &event);
|
||||
void onPaint(wxPaintEvent &event);
|
||||
void onKeyDown(wxKeyEvent &event);
|
||||
void OnSize(wxSizeEvent&);
|
||||
void setCurrentGLContext();
|
||||
|
||||
wxGLContext * getCtx() { return context; }
|
||||
private:
|
||||
MainWindow *mainWindow;
|
||||
wxGLContext *context;
|
||||
};
|
||||
wxGLContext * getCtx() {
|
||||
return context;
|
||||
}
|
||||
private:
|
||||
MainWindow *mainWindow;
|
||||
wxGLContext *context;
|
||||
};
|
||||
|
||||
|
||||
// ===============================
|
||||
// class App
|
||||
// ===============================
|
||||
// ===============================
|
||||
// class App
|
||||
// ===============================
|
||||
|
||||
class App: public wxApp{
|
||||
private:
|
||||
MainWindow *mainWindow;
|
||||
class App : public wxApp {
|
||||
private:
|
||||
MainWindow *mainWindow;
|
||||
|
||||
public:
|
||||
App() : wxApp() {
|
||||
mainWindow = NULL;
|
||||
}
|
||||
virtual ~App() {
|
||||
}
|
||||
virtual bool OnInit();
|
||||
virtual int MainLoop();
|
||||
virtual int OnExit();
|
||||
};
|
||||
|
||||
public:
|
||||
App() : wxApp() {
|
||||
mainWindow = NULL;
|
||||
}
|
||||
virtual ~App() {}
|
||||
virtual bool OnInit();
|
||||
virtual int MainLoop();
|
||||
virtual int OnExit();
|
||||
};
|
||||
|
||||
}}//end namespace
|
||||
}//end namespace
|
||||
|
||||
DECLARE_APP(Shared::G3dViewer::App)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,8 +13,8 @@
|
||||
#define _SHADER_G3DVIEWER_RENDERER_H_
|
||||
|
||||
#ifdef WIN32
|
||||
#include <winsock2.h>
|
||||
#include <winsock.h>
|
||||
#include <winsock2.h>
|
||||
#include <winsock.h>
|
||||
#endif
|
||||
|
||||
#include "model_renderer.h"
|
||||
@@ -45,122 +45,134 @@ using Shared::Graphics::Texture;
|
||||
|
||||
using namespace Shared::Graphics;
|
||||
|
||||
namespace Shared{ namespace G3dViewer{
|
||||
namespace Shared {
|
||||
namespace G3dViewer {
|
||||
|
||||
// ===============================================
|
||||
// class MeshCallbackTeamColor
|
||||
// ===============================================
|
||||
// ===============================================
|
||||
// class MeshCallbackTeamColor
|
||||
// ===============================================
|
||||
|
||||
class MeshCallbackTeamColor: public MeshCallback{
|
||||
private:
|
||||
const Texture *teamTexture;
|
||||
class MeshCallbackTeamColor : public MeshCallback {
|
||||
private:
|
||||
const Texture *teamTexture;
|
||||
|
||||
public:
|
||||
MeshCallbackTeamColor() : MeshCallback() {
|
||||
teamTexture = NULL;
|
||||
}
|
||||
void setTeamTexture(const Texture *teamTexture) {
|
||||
this->teamTexture = teamTexture;
|
||||
}
|
||||
virtual void execute(const Mesh *mesh);
|
||||
};
|
||||
|
||||
// ===============================
|
||||
// class Renderer
|
||||
// ===============================
|
||||
|
||||
class Renderer : public RendererInterface {
|
||||
public:
|
||||
static int windowX;
|
||||
static int windowY;
|
||||
static int windowW;
|
||||
static int windowH;
|
||||
|
||||
public:
|
||||
enum PlayerColor {
|
||||
pcRed,
|
||||
pcBlue,
|
||||
pcGreen,
|
||||
pcYellow,
|
||||
pcWhite,
|
||||
pcCyan,
|
||||
pcOrange,
|
||||
pcMagenta
|
||||
};
|
||||
|
||||
private:
|
||||
bool wireframe;
|
||||
bool normals;
|
||||
bool grid;
|
||||
|
||||
int width;
|
||||
int height;
|
||||
|
||||
ModelRenderer *modelRenderer;
|
||||
TextureManager *textureManager;
|
||||
ParticleRenderer *particleRenderer;
|
||||
|
||||
ParticleManager *particleManager;
|
||||
ModelManager *modelManager;
|
||||
|
||||
Texture2D *customTextureRed;
|
||||
Texture2D *customTextureBlue;
|
||||
Texture2D *customTextureGreen;
|
||||
Texture2D *customTextureYellow;
|
||||
Texture2D *customTextureWhite;
|
||||
Texture2D *customTextureCyan;
|
||||
Texture2D *customTextureOrange;
|
||||
Texture2D *customTextureMagenta;
|
||||
MeshCallbackTeamColor meshCallbackTeamColor;
|
||||
|
||||
float red;
|
||||
float green;
|
||||
float blue;
|
||||
float alpha;
|
||||
|
||||
Renderer();
|
||||
void checkGlCaps();
|
||||
void checkExtension(const string &extension, const string &msg);
|
||||
|
||||
public:
|
||||
virtual ~Renderer();
|
||||
static Renderer *getInstance();
|
||||
|
||||
void init();
|
||||
void reset(int w, int h, PlayerColor playerColor);
|
||||
void transform(float rotX, float rotY, float zoom);
|
||||
void renderGrid();
|
||||
|
||||
bool getNormals() const {
|
||||
return normals;
|
||||
}
|
||||
bool getWireframe() const {
|
||||
return wireframe;
|
||||
}
|
||||
bool getGrid() const {
|
||||
return grid;
|
||||
}
|
||||
|
||||
void toggleNormals();
|
||||
void toggleWireframe();
|
||||
void toggleGrid();
|
||||
|
||||
void renderTheModel(Model *model, float f);
|
||||
|
||||
void manageParticleSystem(ParticleSystem *particleSystem);
|
||||
void updateParticleManager();
|
||||
void renderParticleManager();
|
||||
Texture2D *getPlayerColorTexture(PlayerColor playerColor);
|
||||
|
||||
Texture2D * getNewTexture2D();
|
||||
|
||||
Model *newModel(ResourceScope rs, const string &path, bool deletePixMapAfterLoad = false, std::map<string, vector<pair<string, string> > > *loadedFileList = NULL, string *sourceLoader = NULL);
|
||||
void endModel(ResourceScope rs, Model *model);
|
||||
Texture2D *newTexture2D(ResourceScope rs) {
|
||||
return getNewTexture2D();
|
||||
}
|
||||
|
||||
void initTextureManager();
|
||||
void initModelManager();
|
||||
|
||||
void end();
|
||||
|
||||
void setBackgroundColor(float red, float green, float blue);
|
||||
void setAlphaColor(float alpha);
|
||||
void saveScreen(const string &path, std::pair<int, int> *overrideSize);
|
||||
bool hasActiveParticleSystem(ParticleSystem::ParticleSystemType typeName) const;
|
||||
};
|
||||
|
||||
public:
|
||||
MeshCallbackTeamColor() : MeshCallback() {
|
||||
teamTexture = NULL;
|
||||
}
|
||||
void setTeamTexture(const Texture *teamTexture) {this->teamTexture= teamTexture;}
|
||||
virtual void execute(const Mesh *mesh);
|
||||
};
|
||||
|
||||
// ===============================
|
||||
// class Renderer
|
||||
// ===============================
|
||||
|
||||
class Renderer : public RendererInterface {
|
||||
public:
|
||||
static int windowX;
|
||||
static int windowY;
|
||||
static int windowW;
|
||||
static int windowH;
|
||||
|
||||
public:
|
||||
enum PlayerColor{
|
||||
pcRed,
|
||||
pcBlue,
|
||||
pcGreen,
|
||||
pcYellow,
|
||||
pcWhite,
|
||||
pcCyan,
|
||||
pcOrange,
|
||||
pcMagenta
|
||||
};
|
||||
|
||||
private:
|
||||
bool wireframe;
|
||||
bool normals;
|
||||
bool grid;
|
||||
|
||||
int width;
|
||||
int height;
|
||||
|
||||
ModelRenderer *modelRenderer;
|
||||
TextureManager *textureManager;
|
||||
ParticleRenderer *particleRenderer;
|
||||
|
||||
ParticleManager *particleManager;
|
||||
ModelManager *modelManager;
|
||||
|
||||
Texture2D *customTextureRed;
|
||||
Texture2D *customTextureBlue;
|
||||
Texture2D *customTextureGreen;
|
||||
Texture2D *customTextureYellow;
|
||||
Texture2D *customTextureWhite;
|
||||
Texture2D *customTextureCyan;
|
||||
Texture2D *customTextureOrange;
|
||||
Texture2D *customTextureMagenta;
|
||||
MeshCallbackTeamColor meshCallbackTeamColor;
|
||||
|
||||
float red;
|
||||
float green;
|
||||
float blue;
|
||||
float alpha;
|
||||
|
||||
Renderer();
|
||||
void checkGlCaps();
|
||||
void checkExtension(const string &extension, const string &msg);
|
||||
|
||||
public:
|
||||
virtual ~Renderer();
|
||||
static Renderer *getInstance();
|
||||
|
||||
void init();
|
||||
void reset(int w, int h, PlayerColor playerColor);
|
||||
void transform(float rotX, float rotY, float zoom);
|
||||
void renderGrid();
|
||||
|
||||
bool getNormals() const {return normals;}
|
||||
bool getWireframe() const {return wireframe;}
|
||||
bool getGrid() const {return grid;}
|
||||
|
||||
void toggleNormals();
|
||||
void toggleWireframe();
|
||||
void toggleGrid();
|
||||
|
||||
void renderTheModel(Model *model, float f);
|
||||
|
||||
void manageParticleSystem(ParticleSystem *particleSystem);
|
||||
void updateParticleManager();
|
||||
void renderParticleManager();
|
||||
Texture2D *getPlayerColorTexture(PlayerColor playerColor);
|
||||
|
||||
Texture2D * getNewTexture2D();
|
||||
|
||||
Model *newModel(ResourceScope rs,const string &path,bool deletePixMapAfterLoad=false,std::map<string,vector<pair<string, string> > > *loadedFileList=NULL, string *sourceLoader=NULL);
|
||||
void endModel(ResourceScope rs,Model *model);
|
||||
Texture2D *newTexture2D(ResourceScope rs) { return getNewTexture2D(); }
|
||||
|
||||
void initTextureManager();
|
||||
void initModelManager();
|
||||
|
||||
void end();
|
||||
|
||||
void setBackgroundColor(float red, float green, float blue);
|
||||
void setAlphaColor(float alpha);
|
||||
void saveScreen(const string &path,std::pair<int,int> *overrideSize);
|
||||
bool hasActiveParticleSystem(ParticleSystem::ParticleSystemType typeName) const;
|
||||
};
|
||||
|
||||
}}//end namespace
|
||||
}//end namespace
|
||||
|
||||
#endif
|
||||
|
||||
@@ -5,7 +5,7 @@ SET(EXTERNAL_LIBS "")
|
||||
SET(TARGET_NAME "zetaglest")
|
||||
SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6")
|
||||
|
||||
IF(BUILD_MEGAGLEST)
|
||||
IF(BUILD_ZETAGLEST)
|
||||
MESSAGE(STATUS "Will try to build ZetaGlest game")
|
||||
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
||||
@@ -112,8 +112,8 @@ IF(BUILD_MEGAGLEST)
|
||||
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${GLEW_LIBRARIES})
|
||||
ENDIF()
|
||||
|
||||
IF(VLC_MIN_VERSION_MG)
|
||||
SET(LIBVLC_MIN_VERSION "${VLC_MIN_VERSION_MG}")
|
||||
IF(VLC_MIN_VERSION_ZG)
|
||||
SET(LIBVLC_MIN_VERSION "${VLC_MIN_VERSION_ZG}")
|
||||
ELSE()
|
||||
SET(LIBVLC_MIN_VERSION "1.1.0")
|
||||
ENDIF()
|
||||
@@ -233,26 +233,26 @@ IF(BUILD_MEGAGLEST)
|
||||
SET(GLEST_LIB_INCLUDE_DIRS ${GLEST_LIB_INCLUDE_DIRS} ${GLEST_LIB_INCLUDE_ROOT}platform/unix)
|
||||
ENDIF()
|
||||
|
||||
SET(MG_SOURCE_FILES "")
|
||||
SET(ZG_SOURCE_FILES "")
|
||||
|
||||
FOREACH(DIR IN LISTS DIRS_WITH_SRC)
|
||||
INCLUDE_DIRECTORIES( ${DIR} )
|
||||
|
||||
set(SRC_DIR_TO_GLOB ${DIR})
|
||||
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp)
|
||||
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.c)
|
||||
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
FILE(GLOB INCLUDE_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.h)
|
||||
SET(MG_INCLUDE_FILES ${MG_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR})
|
||||
SET(ZG_INCLUDE_FILES ${ZG_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR})
|
||||
|
||||
IF(APPLE)
|
||||
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm)
|
||||
#MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}")
|
||||
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.m)
|
||||
#MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}")
|
||||
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
SET(ZG_SOURCE_FILES ${ZG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||
ENDIF(APPLE)
|
||||
ENDFOREACH(DIR)
|
||||
|
||||
@@ -261,18 +261,18 @@ IF(BUILD_MEGAGLEST)
|
||||
ENDIF()
|
||||
|
||||
IF(WANT_DEV_OUTPATH)
|
||||
SET(EXECUTABLE_OUTPUT_PATH "${MEGAGLEST_FRIENDLY_OUTPUT_PATH}")
|
||||
SET(EXECUTABLE_OUTPUT_PATH "${ZETAGLEST_FRIENDLY_OUTPUT_PATH}")
|
||||
ENDIF()
|
||||
|
||||
MESSAGE(STATUS "***Note: The final output path for the ZetaGlest engine will be [${EXECUTABLE_OUTPUT_PATH}]")
|
||||
|
||||
SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
||||
SET_SOURCE_FILES_PROPERTIES(${ZG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
||||
|
||||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||
ADD_EXECUTABLE(${TARGET_NAME} ${ZG_SOURCE_FILES} ${ZG_INCLUDE_FILES})
|
||||
|
||||
SET(MG_STREFLOP "")
|
||||
SET(ZG_STREFLOP "")
|
||||
IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
|
||||
SET(MG_STREFLOP "streflop")
|
||||
SET(ZG_STREFLOP "streflop")
|
||||
ENDIF()
|
||||
|
||||
if(WANT_USE_GoogleBreakpad)
|
||||
@@ -289,12 +289,12 @@ IF(BUILD_MEGAGLEST)
|
||||
endif()
|
||||
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${MG_STREFLOP} libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 ${SDL_VERSION_NAME} ${SDL_VERSION_NAME}main lua5.1 ${ZG_STREFLOP} libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32)
|
||||
ENDIF()
|
||||
|
||||
IF(NOT WIN32)
|
||||
IF(WANT_USE_STREFLOP AND NOT STREFLOP_FOUND)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${MG_STREFLOP})
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${ZG_STREFLOP})
|
||||
ENDIF()
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
|
||||
ENDIF()
|
||||
@@ -307,17 +307,17 @@ IF(BUILD_MEGAGLEST)
|
||||
|
||||
IF(EXISTS ${HELP2MAN})
|
||||
MESSAGE(STATUS "***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
|
||||
SET(MG_MANPAGE_DESCRIPTION "3D multi-player real time strategy game")
|
||||
SET(ZG_MANPAGE_DESCRIPTION "3D multi-player real time strategy game")
|
||||
|
||||
IF(EXISTS ${XVFB_EXEC})
|
||||
MESSAGE(STATUS "***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
|
||||
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name="${MG_MANPAGE_DESCRIPTION}" --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME}
|
||||
COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name="${ZG_MANPAGE_DESCRIPTION}" --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ELSE()
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
COMMAND ${HELP2MAN} --name="${MG_MANPAGE_DESCRIPTION}" --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME}
|
||||
COMMAND ${HELP2MAN} --name="${ZG_MANPAGE_DESCRIPTION}" --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME}
|
||||
DEPENDS ${TARGET_NAME})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
@@ -329,57 +329,57 @@ IF(BUILD_MEGAGLEST)
|
||||
# Installation of the program
|
||||
INSTALL(TARGETS
|
||||
${TARGET_NAME}
|
||||
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_BIN_INSTALL_PATH})
|
||||
|
||||
IF(EXISTS ${HELP2MAN} AND NOT "${MEGAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "")
|
||||
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")
|
||||
IF(EXISTS ${HELP2MAN} AND NOT "${ZETAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "")
|
||||
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${ZETAGLEST_MANPAGE_INSTALL_PATH}]")
|
||||
|
||||
# Installation of the program manpage file
|
||||
INSTALL(FILES
|
||||
"${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}"
|
||||
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_MANPAGE_INSTALL_PATH})
|
||||
ENDIF()
|
||||
|
||||
IF(UNIX)
|
||||
INSTALL(PROGRAMS
|
||||
"${PROJECT_SOURCE_DIR}/mk/linux/start_zetaglest_gameserver"
|
||||
DESTINATION ${MEGAGLEST_INI_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_INI_INSTALL_PATH})
|
||||
ENDIF()
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/shared/glestkeys.ini"
|
||||
"${PROJECT_SOURCE_DIR}/mk/shared/servers.ini"
|
||||
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_DATA_INSTALL_PATH})
|
||||
IF(WIN32)
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/windows/glest.ini"
|
||||
DESTINATION ${MEGAGLEST_INI_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_INI_INSTALL_PATH})
|
||||
ELSEIF(UNIX AND NOT APPLE)
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
|
||||
DESTINATION ${MEGAGLEST_INI_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_INI_INSTALL_PATH})
|
||||
ELSEIF(UNIX AND APPLE)
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/glest.ini"
|
||||
DESTINATION ${MEGAGLEST_INI_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_INI_INSTALL_PATH})
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macos/p7zip/")
|
||||
INSTALL(DIRECTORY
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/p7zip"
|
||||
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_DATA_INSTALL_PATH})
|
||||
ENDIF()
|
||||
IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macos/lib/")
|
||||
INSTALL(DIRECTORY
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/lib/"
|
||||
DESTINATION "${MEGAGLEST_DATA_INSTALL_PATH}/../../Frameworks/")
|
||||
DESTINATION "${ZETAGLEST_DATA_INSTALL_PATH}/../../Frameworks/")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/shared/zetaglest.ico"
|
||||
DESTINATION ${MEGAGLEST_INI_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_INI_INSTALL_PATH})
|
||||
IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY)
|
||||
INSTALL(FILES
|
||||
"${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns"
|
||||
DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
|
||||
DESTINATION ${ZETAGLEST_ICON_INSTALL_PATH})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -22,410 +22,389 @@
|
||||
# include "leak_dumper.h"
|
||||
|
||||
using
|
||||
std::deque;
|
||||
std::deque;
|
||||
using
|
||||
std::vector;
|
||||
std::vector;
|
||||
using
|
||||
std::list;
|
||||
std::list;
|
||||
using
|
||||
Shared::Util::RandomGen;
|
||||
Shared::Util::RandomGen;
|
||||
|
||||
namespace
|
||||
Glest
|
||||
{
|
||||
namespace
|
||||
Game
|
||||
{
|
||||
Glest {
|
||||
namespace
|
||||
Game {
|
||||
|
||||
class
|
||||
AiInterface;
|
||||
class
|
||||
AiRule;
|
||||
class
|
||||
AiInterface;
|
||||
class
|
||||
AiRule;
|
||||
|
||||
// =====================================================
|
||||
// class Task
|
||||
//
|
||||
/// An action that has to be performed by the IA
|
||||
// =====================================================
|
||||
// =====================================================
|
||||
// class Task
|
||||
//
|
||||
/// An action that has to be performed by the IA
|
||||
// =====================================================
|
||||
|
||||
enum TaskClass
|
||||
{
|
||||
tcProduce,
|
||||
tcBuild,
|
||||
tcUpgrade
|
||||
};
|
||||
enum TaskClass {
|
||||
tcProduce,
|
||||
tcBuild,
|
||||
tcUpgrade
|
||||
};
|
||||
|
||||
class
|
||||
Task
|
||||
{
|
||||
protected:
|
||||
TaskClass
|
||||
taskClass;
|
||||
class
|
||||
Task {
|
||||
protected:
|
||||
TaskClass
|
||||
taskClass;
|
||||
|
||||
public:
|
||||
Task ();
|
||||
virtual ~
|
||||
Task ()
|
||||
{
|
||||
}
|
||||
TaskClass
|
||||
getClass () const
|
||||
{
|
||||
return
|
||||
taskClass;
|
||||
}
|
||||
virtual string
|
||||
toString () const = 0;
|
||||
public:
|
||||
Task();
|
||||
virtual ~
|
||||
Task() {
|
||||
}
|
||||
TaskClass
|
||||
getClass() const {
|
||||
return
|
||||
taskClass;
|
||||
}
|
||||
virtual string
|
||||
toString() const = 0;
|
||||
|
||||
virtual void
|
||||
saveGame (XmlNode * rootNode) const = 0;
|
||||
};
|
||||
virtual void
|
||||
saveGame(XmlNode * rootNode) const = 0;
|
||||
};
|
||||
|
||||
// ==================== ProduceTask ====================
|
||||
// ==================== ProduceTask ====================
|
||||
|
||||
class
|
||||
ProduceTask:
|
||||
public
|
||||
Task
|
||||
{
|
||||
private:
|
||||
UnitClass
|
||||
unitClass;
|
||||
const UnitType *
|
||||
unitType;
|
||||
const ResourceType *
|
||||
resourceType;
|
||||
class
|
||||
ProduceTask :
|
||||
public
|
||||
Task {
|
||||
private:
|
||||
UnitClass
|
||||
unitClass;
|
||||
const UnitType *
|
||||
unitType;
|
||||
const ResourceType *
|
||||
resourceType;
|
||||
|
||||
ProduceTask ();
|
||||
public:
|
||||
explicit
|
||||
ProduceTask (UnitClass unitClass);
|
||||
explicit
|
||||
ProduceTask (const UnitType * unitType);
|
||||
explicit
|
||||
ProduceTask (const ResourceType * resourceType);
|
||||
ProduceTask();
|
||||
public:
|
||||
explicit
|
||||
ProduceTask(UnitClass unitClass);
|
||||
explicit
|
||||
ProduceTask(const UnitType * unitType);
|
||||
explicit
|
||||
ProduceTask(const ResourceType * resourceType);
|
||||
|
||||
UnitClass
|
||||
getUnitClass () const
|
||||
{
|
||||
return
|
||||
unitClass;
|
||||
}
|
||||
const UnitType *
|
||||
getUnitType () const
|
||||
{
|
||||
return
|
||||
unitType;
|
||||
}
|
||||
const ResourceType *
|
||||
getResourceType () const
|
||||
{
|
||||
return
|
||||
resourceType;
|
||||
}
|
||||
virtual string
|
||||
toString () const;
|
||||
UnitClass
|
||||
getUnitClass() const {
|
||||
return
|
||||
unitClass;
|
||||
}
|
||||
const UnitType *
|
||||
getUnitType() const {
|
||||
return
|
||||
unitType;
|
||||
}
|
||||
const ResourceType *
|
||||
getResourceType() const {
|
||||
return
|
||||
resourceType;
|
||||
}
|
||||
virtual string
|
||||
toString() const;
|
||||
|
||||
virtual void
|
||||
saveGame (XmlNode * rootNode) const;
|
||||
static ProduceTask *
|
||||
loadGame (const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
virtual void
|
||||
saveGame(XmlNode * rootNode) const;
|
||||
static ProduceTask *
|
||||
loadGame(const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
|
||||
// ==================== BuildTask ====================
|
||||
// ==================== BuildTask ====================
|
||||
|
||||
class
|
||||
BuildTask:
|
||||
public
|
||||
Task
|
||||
{
|
||||
private:
|
||||
const UnitType *
|
||||
unitType;
|
||||
const ResourceType *
|
||||
resourceType;
|
||||
bool
|
||||
forcePos;
|
||||
Vec2i
|
||||
pos;
|
||||
class
|
||||
BuildTask :
|
||||
public
|
||||
Task {
|
||||
private:
|
||||
const UnitType *
|
||||
unitType;
|
||||
const ResourceType *
|
||||
resourceType;
|
||||
bool
|
||||
forcePos;
|
||||
Vec2i
|
||||
pos;
|
||||
|
||||
BuildTask ();
|
||||
BuildTask();
|
||||
|
||||
public:
|
||||
explicit
|
||||
BuildTask (const UnitType * unitType);
|
||||
explicit
|
||||
BuildTask (const ResourceType * resourceType);
|
||||
BuildTask (const UnitType * unitType, const Vec2i & pos);
|
||||
public:
|
||||
explicit
|
||||
BuildTask(const UnitType * unitType);
|
||||
explicit
|
||||
BuildTask(const ResourceType * resourceType);
|
||||
BuildTask(const UnitType * unitType, const Vec2i & pos);
|
||||
|
||||
const UnitType *
|
||||
getUnitType () const
|
||||
{
|
||||
return
|
||||
unitType;
|
||||
}
|
||||
const ResourceType *
|
||||
getResourceType () const
|
||||
{
|
||||
return
|
||||
resourceType;
|
||||
}
|
||||
bool
|
||||
getForcePos () const
|
||||
{
|
||||
return
|
||||
forcePos;
|
||||
}
|
||||
Vec2i
|
||||
getPos () const
|
||||
{
|
||||
return
|
||||
pos;
|
||||
}
|
||||
virtual string
|
||||
toString () const;
|
||||
const UnitType *
|
||||
getUnitType() const {
|
||||
return
|
||||
unitType;
|
||||
}
|
||||
const ResourceType *
|
||||
getResourceType() const {
|
||||
return
|
||||
resourceType;
|
||||
}
|
||||
bool
|
||||
getForcePos() const {
|
||||
return
|
||||
forcePos;
|
||||
}
|
||||
Vec2i
|
||||
getPos() const {
|
||||
return
|
||||
pos;
|
||||
}
|
||||
virtual string
|
||||
toString() const;
|
||||
|
||||
virtual void
|
||||
saveGame (XmlNode * rootNode) const;
|
||||
static BuildTask *
|
||||
loadGame (const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
virtual void
|
||||
saveGame(XmlNode * rootNode) const;
|
||||
static BuildTask *
|
||||
loadGame(const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
|
||||
// ==================== UpgradeTask ====================
|
||||
// ==================== UpgradeTask ====================
|
||||
|
||||
class
|
||||
UpgradeTask:
|
||||
public
|
||||
Task
|
||||
{
|
||||
private:
|
||||
const UpgradeType *
|
||||
upgradeType;
|
||||
class
|
||||
UpgradeTask :
|
||||
public
|
||||
Task {
|
||||
private:
|
||||
const UpgradeType *
|
||||
upgradeType;
|
||||
|
||||
UpgradeTask ();
|
||||
public:
|
||||
explicit
|
||||
UpgradeTask (const UpgradeType * upgradeType);
|
||||
const UpgradeType *
|
||||
getUpgradeType () const
|
||||
{
|
||||
return
|
||||
upgradeType;
|
||||
}
|
||||
virtual string
|
||||
toString () const;
|
||||
UpgradeTask();
|
||||
public:
|
||||
explicit
|
||||
UpgradeTask(const UpgradeType * upgradeType);
|
||||
const UpgradeType *
|
||||
getUpgradeType() const {
|
||||
return
|
||||
upgradeType;
|
||||
}
|
||||
virtual string
|
||||
toString() const;
|
||||
|
||||
virtual void
|
||||
saveGame (XmlNode * rootNode) const;
|
||||
static UpgradeTask *
|
||||
loadGame (const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
virtual void
|
||||
saveGame(XmlNode * rootNode) const;
|
||||
static UpgradeTask *
|
||||
loadGame(const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
|
||||
// ===============================
|
||||
// class AI
|
||||
//
|
||||
/// Main AI class
|
||||
// ===============================
|
||||
// ===============================
|
||||
// class AI
|
||||
//
|
||||
/// Main AI class
|
||||
// ===============================
|
||||
|
||||
class
|
||||
Ai
|
||||
{
|
||||
private:
|
||||
int
|
||||
maxBuildRadius;
|
||||
class
|
||||
Ai {
|
||||
private:
|
||||
int
|
||||
maxBuildRadius;
|
||||
|
||||
int
|
||||
minMinWarriors;
|
||||
int
|
||||
minMinWarriorsExpandCpuEasy;
|
||||
int
|
||||
minMinWarriorsExpandCpuZeta;
|
||||
int
|
||||
minMinWarriorsExpandCpuUltra;
|
||||
int
|
||||
minMinWarriorsExpandCpuNormal;
|
||||
int
|
||||
maxMinWarriors;
|
||||
int
|
||||
minMinWarriors;
|
||||
int
|
||||
minMinWarriorsExpandCpuEasy;
|
||||
int
|
||||
minMinWarriorsExpandCpuZeta;
|
||||
int
|
||||
minMinWarriorsExpandCpuUltra;
|
||||
int
|
||||
minMinWarriorsExpandCpuNormal;
|
||||
int
|
||||
maxMinWarriors;
|
||||
|
||||
int
|
||||
maxExpansions;
|
||||
int
|
||||
villageRadius;
|
||||
int
|
||||
scoutResourceRange;
|
||||
int
|
||||
minWorkerAttackersHarvesting;
|
||||
int
|
||||
minBuildSpacing;
|
||||
int
|
||||
maxExpansions;
|
||||
int
|
||||
villageRadius;
|
||||
int
|
||||
scoutResourceRange;
|
||||
int
|
||||
minWorkerAttackersHarvesting;
|
||||
int
|
||||
minBuildSpacing;
|
||||
|
||||
public:
|
||||
enum ResourceUsage
|
||||
{
|
||||
ruHarvester,
|
||||
ruWarrior,
|
||||
ruBuilding,
|
||||
ruUpgrade
|
||||
};
|
||||
public:
|
||||
enum ResourceUsage {
|
||||
ruHarvester,
|
||||
ruWarrior,
|
||||
ruBuilding,
|
||||
ruUpgrade
|
||||
};
|
||||
|
||||
private:
|
||||
typedef
|
||||
vector <
|
||||
AiRule * >
|
||||
AiRules;
|
||||
typedef
|
||||
list < const Task *>
|
||||
Tasks;
|
||||
typedef
|
||||
deque <
|
||||
Vec2i >
|
||||
Positions;
|
||||
private:
|
||||
typedef
|
||||
vector <
|
||||
AiRule * >
|
||||
AiRules;
|
||||
typedef
|
||||
list < const Task *>
|
||||
Tasks;
|
||||
typedef
|
||||
deque <
|
||||
Vec2i >
|
||||
Positions;
|
||||
|
||||
private:
|
||||
AiInterface *
|
||||
aiInterface;
|
||||
AiRules
|
||||
aiRules;
|
||||
int
|
||||
startLoc;
|
||||
bool
|
||||
randomMinWarriorsReached;
|
||||
Tasks
|
||||
tasks;
|
||||
Positions
|
||||
expansionPositions;
|
||||
RandomGen
|
||||
random;
|
||||
std::map < int, int >
|
||||
factionSwitchTeamRequestCount;
|
||||
int
|
||||
minWarriors;
|
||||
private:
|
||||
AiInterface *
|
||||
aiInterface;
|
||||
AiRules
|
||||
aiRules;
|
||||
int
|
||||
startLoc;
|
||||
bool
|
||||
randomMinWarriorsReached;
|
||||
Tasks
|
||||
tasks;
|
||||
Positions
|
||||
expansionPositions;
|
||||
RandomGen
|
||||
random;
|
||||
std::map < int, int >
|
||||
factionSwitchTeamRequestCount;
|
||||
int
|
||||
minWarriors;
|
||||
|
||||
bool
|
||||
getAdjacentUnits (std::map < float, std::map < int,
|
||||
const Unit * > >&signalAdjacentUnits,
|
||||
const Unit * unit);
|
||||
bool
|
||||
getAdjacentUnits(std::map < float, std::map < int,
|
||||
const Unit * > >&signalAdjacentUnits,
|
||||
const Unit * unit);
|
||||
|
||||
public:
|
||||
Ai ()
|
||||
{
|
||||
// Defaults that used to be static which can now be overriden
|
||||
maxBuildRadius = 40;
|
||||
minMinWarriors = 7;
|
||||
minMinWarriorsExpandCpuEasy = 1;
|
||||
minMinWarriorsExpandCpuZeta = 3;
|
||||
minMinWarriorsExpandCpuUltra = 3;
|
||||
minMinWarriorsExpandCpuNormal = 3;
|
||||
maxMinWarriors = 20;
|
||||
maxExpansions = 20;
|
||||
villageRadius = 15;
|
||||
scoutResourceRange = 20;
|
||||
minWorkerAttackersHarvesting = 3;
|
||||
minBuildSpacing = 1;
|
||||
public:
|
||||
Ai() {
|
||||
// Defaults that used to be static which can now be overriden
|
||||
maxBuildRadius = 40;
|
||||
minMinWarriors = 7;
|
||||
minMinWarriorsExpandCpuEasy = 1;
|
||||
minMinWarriorsExpandCpuZeta = 3;
|
||||
minMinWarriorsExpandCpuUltra = 3;
|
||||
minMinWarriorsExpandCpuNormal = 3;
|
||||
maxMinWarriors = 20;
|
||||
maxExpansions = 20;
|
||||
villageRadius = 15;
|
||||
scoutResourceRange = 20;
|
||||
minWorkerAttackersHarvesting = 3;
|
||||
minBuildSpacing = 1;
|
||||
|
||||
aiInterface = NULL;
|
||||
startLoc = -1;
|
||||
randomMinWarriorsReached = false;
|
||||
minWarriors = 0;
|
||||
}
|
||||
~
|
||||
Ai ();
|
||||
aiInterface = NULL;
|
||||
startLoc = -1;
|
||||
randomMinWarriorsReached = false;
|
||||
minWarriors = 0;
|
||||
}
|
||||
~
|
||||
Ai();
|
||||
|
||||
void
|
||||
init (AiInterface * aiInterface, int useStartLocation = -1);
|
||||
void
|
||||
update ();
|
||||
void
|
||||
init(AiInterface * aiInterface, int useStartLocation = -1);
|
||||
void
|
||||
update();
|
||||
|
||||
//state requests
|
||||
AiInterface *
|
||||
getAiInterface () const
|
||||
{
|
||||
return
|
||||
aiInterface;
|
||||
}
|
||||
RandomGen *
|
||||
getRandom ();
|
||||
int
|
||||
getCountOfType (const UnitType * ut);
|
||||
//state requests
|
||||
AiInterface *
|
||||
getAiInterface() const {
|
||||
return
|
||||
aiInterface;
|
||||
}
|
||||
RandomGen *
|
||||
getRandom();
|
||||
int
|
||||
getCountOfType(const UnitType * ut);
|
||||
|
||||
int
|
||||
getMinWarriors () const
|
||||
{
|
||||
return
|
||||
minWarriors;
|
||||
}
|
||||
int
|
||||
getMinWarriors() const {
|
||||
return
|
||||
minWarriors;
|
||||
}
|
||||
|
||||
int
|
||||
getCountOfClass (UnitClass uc,
|
||||
UnitClass * additionalUnitClassToExcludeFromCount =
|
||||
NULL);
|
||||
float
|
||||
getRatioOfClass (UnitClass uc,
|
||||
UnitClass * additionalUnitClassToExcludeFromCount =
|
||||
NULL);
|
||||
int
|
||||
getCountOfClass(UnitClass uc,
|
||||
UnitClass * additionalUnitClassToExcludeFromCount =
|
||||
NULL);
|
||||
float
|
||||
getRatioOfClass(UnitClass uc,
|
||||
UnitClass * additionalUnitClassToExcludeFromCount =
|
||||
NULL);
|
||||
|
||||
const ResourceType *
|
||||
getNeededResource (int unitIndex);
|
||||
bool
|
||||
isStableBase ();
|
||||
bool
|
||||
findPosForBuilding (const UnitType * building, const Vec2i & searchPos,
|
||||
Vec2i & pos);
|
||||
bool
|
||||
findAbleUnit (int *unitIndex, CommandClass ability, bool idleOnly);
|
||||
bool
|
||||
findAbleUnit (int *unitIndex, CommandClass ability,
|
||||
CommandClass currentCommand);
|
||||
//vector<int> findUnitsDoingCommand(CommandClass currentCommand);
|
||||
vector < int >
|
||||
findUnitsHarvestingResourceType (const ResourceType * rt);
|
||||
const ResourceType *
|
||||
getNeededResource(int unitIndex);
|
||||
bool
|
||||
isStableBase();
|
||||
bool
|
||||
findPosForBuilding(const UnitType * building, const Vec2i & searchPos,
|
||||
Vec2i & pos);
|
||||
bool
|
||||
findAbleUnit(int *unitIndex, CommandClass ability, bool idleOnly);
|
||||
bool
|
||||
findAbleUnit(int *unitIndex, CommandClass ability,
|
||||
CommandClass currentCommand);
|
||||
//vector<int> findUnitsDoingCommand(CommandClass currentCommand);
|
||||
vector < int >
|
||||
findUnitsHarvestingResourceType(const ResourceType * rt);
|
||||
|
||||
bool
|
||||
beingAttacked (Vec2i & pos, Field & field, int radius);
|
||||
bool
|
||||
beingAttacked(Vec2i & pos, Field & field, int radius);
|
||||
|
||||
//tasks
|
||||
void
|
||||
addTask (const Task * task);
|
||||
void
|
||||
addPriorityTask (const Task * task);
|
||||
bool
|
||||
anyTask ();
|
||||
const Task *
|
||||
getTask () const;
|
||||
void
|
||||
removeTask (const Task * task);
|
||||
void
|
||||
retryTask (const Task * task);
|
||||
//tasks
|
||||
void
|
||||
addTask(const Task * task);
|
||||
void
|
||||
addPriorityTask(const Task * task);
|
||||
bool
|
||||
anyTask();
|
||||
const Task *
|
||||
getTask() const;
|
||||
void
|
||||
removeTask(const Task * task);
|
||||
void
|
||||
retryTask(const Task * task);
|
||||
|
||||
//expansions
|
||||
void
|
||||
addExpansion (const Vec2i & pos);
|
||||
Vec2i
|
||||
getRandomHomePosition ();
|
||||
//expansions
|
||||
void
|
||||
addExpansion(const Vec2i & pos);
|
||||
Vec2i
|
||||
getRandomHomePosition();
|
||||
|
||||
//actions
|
||||
void
|
||||
sendScoutPatrol ();
|
||||
void
|
||||
massiveAttack (const Vec2i & pos, Field field, bool ultraAttack =
|
||||
false);
|
||||
void
|
||||
returnBase (int unitIndex);
|
||||
void
|
||||
harvest (int unitIndex);
|
||||
bool
|
||||
haveBlockedUnits ();
|
||||
void
|
||||
unblockUnits ();
|
||||
//actions
|
||||
void
|
||||
sendScoutPatrol();
|
||||
void
|
||||
massiveAttack(const Vec2i & pos, Field field, bool ultraAttack =
|
||||
false);
|
||||
void
|
||||
returnBase(int unitIndex);
|
||||
void
|
||||
harvest(int unitIndex);
|
||||
bool
|
||||
haveBlockedUnits();
|
||||
void
|
||||
unblockUnits();
|
||||
|
||||
bool
|
||||
outputAIBehaviourToConsole () const;
|
||||
bool
|
||||
outputAIBehaviourToConsole() const;
|
||||
|
||||
void
|
||||
saveGame (XmlNode * rootNode) const;
|
||||
void
|
||||
loadGame (const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
void
|
||||
saveGame(XmlNode * rootNode) const;
|
||||
void
|
||||
loadGame(const XmlNode * rootNode, Faction * faction);
|
||||
};
|
||||
|
||||
}} //end namespace
|
||||
}
|
||||
} //end namespace
|
||||
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -33,309 +33,295 @@
|
||||
# include "leak_dumper.h"
|
||||
|
||||
using
|
||||
Shared::Util::intToStr;
|
||||
Shared::Util::intToStr;
|
||||
|
||||
namespace
|
||||
Glest
|
||||
{
|
||||
namespace
|
||||
Game
|
||||
{
|
||||
Glest {
|
||||
namespace
|
||||
Game {
|
||||
|
||||
// =====================================================
|
||||
// class AiInterface
|
||||
//
|
||||
/// The AI will interact with the game through this interface
|
||||
// =====================================================
|
||||
// =====================================================
|
||||
// class AiInterface
|
||||
//
|
||||
/// The AI will interact with the game through this interface
|
||||
// =====================================================
|
||||
|
||||
class
|
||||
AiInterfaceThread:
|
||||
public
|
||||
BaseThread,
|
||||
public
|
||||
SlaveThreadControllerInterface
|
||||
{
|
||||
protected:
|
||||
class
|
||||
AiInterfaceThread :
|
||||
public
|
||||
BaseThread,
|
||||
public
|
||||
SlaveThreadControllerInterface {
|
||||
protected:
|
||||
|
||||
AiInterface *
|
||||
aiIntf;
|
||||
Semaphore
|
||||
semTaskSignalled;
|
||||
Mutex *
|
||||
triggerIdMutex;
|
||||
std::pair < int,
|
||||
bool >
|
||||
frameIndex;
|
||||
MasterSlaveThreadController *
|
||||
masterController;
|
||||
AiInterface *
|
||||
aiIntf;
|
||||
Semaphore
|
||||
semTaskSignalled;
|
||||
Mutex *
|
||||
triggerIdMutex;
|
||||
std::pair < int,
|
||||
bool >
|
||||
frameIndex;
|
||||
MasterSlaveThreadController *
|
||||
masterController;
|
||||
|
||||
virtual void
|
||||
setQuitStatus (bool value);
|
||||
virtual void
|
||||
setTaskCompleted (int frameIndex);
|
||||
virtual void
|
||||
setQuitStatus(bool value);
|
||||
virtual void
|
||||
setTaskCompleted(int frameIndex);
|
||||
|
||||
public:
|
||||
explicit
|
||||
AiInterfaceThread (AiInterface * aiIntf);
|
||||
virtual ~
|
||||
AiInterfaceThread ();
|
||||
virtual void
|
||||
execute ();
|
||||
void
|
||||
signal (int frameIndex);
|
||||
bool
|
||||
isSignalCompleted (int frameIndex);
|
||||
public:
|
||||
explicit
|
||||
AiInterfaceThread(AiInterface * aiIntf);
|
||||
virtual ~
|
||||
AiInterfaceThread();
|
||||
virtual void
|
||||
execute();
|
||||
void
|
||||
signal(int frameIndex);
|
||||
bool
|
||||
isSignalCompleted(int frameIndex);
|
||||
|
||||
virtual void
|
||||
setMasterController (MasterSlaveThreadController * master)
|
||||
{
|
||||
masterController = master;
|
||||
}
|
||||
virtual void
|
||||
signalSlave (void *userdata)
|
||||
{
|
||||
signal (*((int *) (userdata)));
|
||||
}
|
||||
virtual void
|
||||
setMasterController(MasterSlaveThreadController * master) {
|
||||
masterController = master;
|
||||
}
|
||||
virtual void
|
||||
signalSlave(void *userdata) {
|
||||
signal(*((int *) (userdata)));
|
||||
}
|
||||
|
||||
virtual void
|
||||
signalQuit ();
|
||||
virtual bool
|
||||
canShutdown (bool deleteSelfIfShutdownDelayed = false);
|
||||
};
|
||||
virtual void
|
||||
signalQuit();
|
||||
virtual bool
|
||||
canShutdown(bool deleteSelfIfShutdownDelayed = false);
|
||||
};
|
||||
|
||||
class
|
||||
AiInterface
|
||||
{
|
||||
private:
|
||||
World *
|
||||
world;
|
||||
Commander *
|
||||
commander;
|
||||
Console *
|
||||
console;
|
||||
GameSettings *
|
||||
gameSettings;
|
||||
class
|
||||
AiInterface {
|
||||
private:
|
||||
World *
|
||||
world;
|
||||
Commander *
|
||||
commander;
|
||||
Console *
|
||||
console;
|
||||
GameSettings *
|
||||
gameSettings;
|
||||
|
||||
Ai
|
||||
ai;
|
||||
Ai
|
||||
ai;
|
||||
|
||||
int
|
||||
timer;
|
||||
int
|
||||
factionIndex;
|
||||
int
|
||||
teamIndex;
|
||||
int
|
||||
timer;
|
||||
int
|
||||
factionIndex;
|
||||
int
|
||||
teamIndex;
|
||||
|
||||
//config
|
||||
bool
|
||||
redir;
|
||||
int
|
||||
logLevel;
|
||||
std::string
|
||||
aiLogFile;
|
||||
FILE *
|
||||
fp;
|
||||
//config
|
||||
bool
|
||||
redir;
|
||||
int
|
||||
logLevel;
|
||||
std::string
|
||||
aiLogFile;
|
||||
FILE *
|
||||
fp;
|
||||
|
||||
std::map < const ResourceType *, int >
|
||||
cacheUnitHarvestResourceLookup;
|
||||
std::map < const ResourceType *, int >
|
||||
cacheUnitHarvestResourceLookup;
|
||||
|
||||
Mutex *
|
||||
aiMutex;
|
||||
Mutex *
|
||||
aiMutex;
|
||||
|
||||
AiInterfaceThread *
|
||||
workerThread;
|
||||
std::vector <
|
||||
Vec2i >
|
||||
enemyWarningPositionList;
|
||||
AiInterfaceThread *
|
||||
workerThread;
|
||||
std::vector <
|
||||
Vec2i >
|
||||
enemyWarningPositionList;
|
||||
|
||||
public:
|
||||
AiInterface (Game & game, int factionIndex, int teamIndex,
|
||||
int useStartLocation = -1);
|
||||
~
|
||||
AiInterface ();
|
||||
public:
|
||||
AiInterface(Game & game, int factionIndex, int teamIndex,
|
||||
int useStartLocation = -1);
|
||||
~
|
||||
AiInterface();
|
||||
|
||||
AiInterface (const AiInterface & obj)
|
||||
{
|
||||
init ();
|
||||
throw
|
||||
megaglest_runtime_error ("class AiInterface is NOT safe to copy!");
|
||||
}
|
||||
AiInterface &
|
||||
operator= (const AiInterface & obj)
|
||||
{
|
||||
init ();
|
||||
throw
|
||||
megaglest_runtime_error ("class AiInterface is NOT safe to assign!");
|
||||
}
|
||||
AiInterface(const AiInterface & obj) {
|
||||
init();
|
||||
throw
|
||||
megaglest_runtime_error("class AiInterface is NOT safe to copy!");
|
||||
}
|
||||
AiInterface &
|
||||
operator= (const AiInterface & obj) {
|
||||
init();
|
||||
throw
|
||||
megaglest_runtime_error("class AiInterface is NOT safe to assign!");
|
||||
}
|
||||
|
||||
//main
|
||||
void
|
||||
update ();
|
||||
//main
|
||||
void
|
||||
update();
|
||||
|
||||
std::vector < Vec2i > getEnemyWarningPositionList ()const
|
||||
{
|
||||
return
|
||||
enemyWarningPositionList;
|
||||
}
|
||||
void
|
||||
removeEnemyWarningPositionFromList (Vec2i & checkPos);
|
||||
std::vector < Vec2i > getEnemyWarningPositionList()const {
|
||||
return
|
||||
enemyWarningPositionList;
|
||||
}
|
||||
void
|
||||
removeEnemyWarningPositionFromList(Vec2i & checkPos);
|
||||
|
||||
inline Mutex *
|
||||
getMutex ()
|
||||
{
|
||||
return aiMutex;
|
||||
}
|
||||
inline Mutex *
|
||||
getMutex() {
|
||||
return aiMutex;
|
||||
}
|
||||
|
||||
void
|
||||
signalWorkerThread (int frameIndex);
|
||||
bool
|
||||
isWorkerThreadSignalCompleted (int frameIndex);
|
||||
AiInterfaceThread *
|
||||
getWorkerThread ()
|
||||
{
|
||||
return workerThread;
|
||||
}
|
||||
void
|
||||
signalWorkerThread(int frameIndex);
|
||||
bool
|
||||
isWorkerThreadSignalCompleted(int frameIndex);
|
||||
AiInterfaceThread *
|
||||
getWorkerThread() {
|
||||
return workerThread;
|
||||
}
|
||||
|
||||
bool
|
||||
isLogLevelEnabled (int level);
|
||||
bool
|
||||
isLogLevelEnabled(int level);
|
||||
|
||||
//get
|
||||
int
|
||||
getTimer () const
|
||||
{
|
||||
return
|
||||
timer;
|
||||
}
|
||||
int
|
||||
getFactionIndex () const
|
||||
{
|
||||
return
|
||||
factionIndex;
|
||||
}
|
||||
//get
|
||||
int
|
||||
getTimer() const {
|
||||
return
|
||||
timer;
|
||||
}
|
||||
int
|
||||
getFactionIndex() const {
|
||||
return
|
||||
factionIndex;
|
||||
}
|
||||
|
||||
//misc
|
||||
void
|
||||
printLog (int logLevel, const string & s);
|
||||
//misc
|
||||
void
|
||||
printLog(int logLevel, const string & s);
|
||||
|
||||
//interact
|
||||
std::pair < CommandResult, string > giveCommand (int unitIndex,
|
||||
CommandClass
|
||||
commandClass,
|
||||
const Vec2i & pos =
|
||||
Vec2i (0));
|
||||
std::pair < CommandResult, string > giveCommand (int unitIndex,
|
||||
const CommandType *
|
||||
commandType,
|
||||
const Vec2i & pos,
|
||||
const UnitType *
|
||||
unitType);
|
||||
std::pair < CommandResult, string > giveCommand (int unitIndex,
|
||||
const CommandType *
|
||||
commandType,
|
||||
const Vec2i & pos,
|
||||
int
|
||||
unitGroupCommandId);
|
||||
std::pair < CommandResult, string > giveCommand (int unitIndex,
|
||||
const CommandType *
|
||||
commandType, Unit * u =
|
||||
NULL);
|
||||
std::pair < CommandResult, string > giveCommand (const Unit * unit,
|
||||
const CommandType *
|
||||
commandType,
|
||||
const Vec2i & pos,
|
||||
int
|
||||
unitGroupCommandId);
|
||||
//interact
|
||||
std::pair < CommandResult, string > giveCommand(int unitIndex,
|
||||
CommandClass
|
||||
commandClass,
|
||||
const Vec2i & pos =
|
||||
Vec2i(0));
|
||||
std::pair < CommandResult, string > giveCommand(int unitIndex,
|
||||
const CommandType *
|
||||
commandType,
|
||||
const Vec2i & pos,
|
||||
const UnitType *
|
||||
unitType);
|
||||
std::pair < CommandResult, string > giveCommand(int unitIndex,
|
||||
const CommandType *
|
||||
commandType,
|
||||
const Vec2i & pos,
|
||||
int
|
||||
unitGroupCommandId);
|
||||
std::pair < CommandResult, string > giveCommand(int unitIndex,
|
||||
const CommandType *
|
||||
commandType, Unit * u =
|
||||
NULL);
|
||||
std::pair < CommandResult, string > giveCommand(const Unit * unit,
|
||||
const CommandType *
|
||||
commandType,
|
||||
const Vec2i & pos,
|
||||
int
|
||||
unitGroupCommandId);
|
||||
|
||||
std::pair < CommandResult,
|
||||
string > giveCommandSwitchTeamVote (const Faction * faction,
|
||||
SwitchTeamVote * vote);
|
||||
std::pair < CommandResult,
|
||||
string > giveCommandSwitchTeamVote(const Faction * faction,
|
||||
SwitchTeamVote * vote);
|
||||
|
||||
//get data
|
||||
const ControlType
|
||||
getControlType ();
|
||||
int
|
||||
getMapMaxPlayers ();
|
||||
Vec2i
|
||||
getHomeLocation ();
|
||||
Vec2i
|
||||
getStartLocation (int locationIndex);
|
||||
int
|
||||
getFactionCount ();
|
||||
int
|
||||
getMyUnitCount () const;
|
||||
int
|
||||
getMyUpgradeCount () const;
|
||||
//int onSightUnitCount();
|
||||
const Resource *
|
||||
getResource (const ResourceType * rt);
|
||||
const Unit *
|
||||
getMyUnit (int unitIndex);
|
||||
Unit *
|
||||
getMyUnitPtr (int unitIndex);
|
||||
//const Unit *getOnSightUnit(int unitIndex);
|
||||
const FactionType *
|
||||
getMyFactionType ();
|
||||
Faction *
|
||||
getMyFaction ();
|
||||
const TechTree *
|
||||
getTechTree ();
|
||||
bool
|
||||
isResourceInRegion (const Vec2i & pos, const ResourceType * rt,
|
||||
Vec2i & resourcePos, int range) const;
|
||||
bool
|
||||
isResourceNear (const Vec2i & pos, const ResourceType * rt,
|
||||
Vec2i & resourcePos, Faction * faction,
|
||||
bool fallbackToPeersHarvestingSameResource) const;
|
||||
bool
|
||||
getNearestSightedResource (const ResourceType * rt, const Vec2i & pos,
|
||||
Vec2i & resultPos,
|
||||
bool usableResourceTypeOnly);
|
||||
bool
|
||||
isAlly (const Unit * unit) const;
|
||||
bool
|
||||
isAlly (int factionIndex) const;
|
||||
bool
|
||||
reqsOk (const RequirableType * rt);
|
||||
bool
|
||||
reqsOk (const CommandType * ct);
|
||||
bool
|
||||
checkCosts (const ProducibleType * pt, const CommandType * ct);
|
||||
bool
|
||||
isFreeCells (const Vec2i & pos, int size, Field field);
|
||||
const Unit *
|
||||
getFirstOnSightEnemyUnit (Vec2i & pos, Field & field, int radius);
|
||||
Map *
|
||||
getMap ();
|
||||
World *
|
||||
getWorld ()
|
||||
{
|
||||
return world;
|
||||
}
|
||||
//get data
|
||||
const ControlType
|
||||
getControlType();
|
||||
int
|
||||
getMapMaxPlayers();
|
||||
Vec2i
|
||||
getHomeLocation();
|
||||
Vec2i
|
||||
getStartLocation(int locationIndex);
|
||||
int
|
||||
getFactionCount();
|
||||
int
|
||||
getMyUnitCount() const;
|
||||
int
|
||||
getMyUpgradeCount() const;
|
||||
//int onSightUnitCount();
|
||||
const Resource *
|
||||
getResource(const ResourceType * rt);
|
||||
const Unit *
|
||||
getMyUnit(int unitIndex);
|
||||
Unit *
|
||||
getMyUnitPtr(int unitIndex);
|
||||
//const Unit *getOnSightUnit(int unitIndex);
|
||||
const FactionType *
|
||||
getMyFactionType();
|
||||
Faction *
|
||||
getMyFaction();
|
||||
const TechTree *
|
||||
getTechTree();
|
||||
bool
|
||||
isResourceInRegion(const Vec2i & pos, const ResourceType * rt,
|
||||
Vec2i & resourcePos, int range) const;
|
||||
bool
|
||||
isResourceNear(const Vec2i & pos, const ResourceType * rt,
|
||||
Vec2i & resourcePos, Faction * faction,
|
||||
bool fallbackToPeersHarvestingSameResource) const;
|
||||
bool
|
||||
getNearestSightedResource(const ResourceType * rt, const Vec2i & pos,
|
||||
Vec2i & resultPos,
|
||||
bool usableResourceTypeOnly);
|
||||
bool
|
||||
isAlly(const Unit * unit) const;
|
||||
bool
|
||||
isAlly(int factionIndex) const;
|
||||
bool
|
||||
reqsOk(const RequirableType * rt);
|
||||
bool
|
||||
reqsOk(const CommandType * ct);
|
||||
bool
|
||||
checkCosts(const ProducibleType * pt, const CommandType * ct);
|
||||
bool
|
||||
isFreeCells(const Vec2i & pos, int size, Field field);
|
||||
const Unit *
|
||||
getFirstOnSightEnemyUnit(Vec2i & pos, Field & field, int radius);
|
||||
Map *
|
||||
getMap();
|
||||
World *
|
||||
getWorld() {
|
||||
return world;
|
||||
}
|
||||
|
||||
bool
|
||||
factionUsesResourceType (const FactionType * factionType,
|
||||
const ResourceType * rt);
|
||||
bool
|
||||
factionUsesResourceType(const FactionType * factionType,
|
||||
const ResourceType * rt);
|
||||
|
||||
void
|
||||
saveGame (XmlNode * rootNode) const;
|
||||
void
|
||||
loadGame (const XmlNode * rootNode, Faction * faction);
|
||||
void
|
||||
saveGame(XmlNode * rootNode) const;
|
||||
void
|
||||
loadGame(const XmlNode * rootNode, Faction * faction);
|
||||
|
||||
private:
|
||||
string getLogFilename ()const
|
||||
{
|
||||
return
|
||||
"ai" +
|
||||
intToStr (factionIndex) +
|
||||
".log";
|
||||
}
|
||||
bool
|
||||
executeCommandOverNetwork ();
|
||||
private:
|
||||
string getLogFilename()const {
|
||||
return
|
||||
"ai" +
|
||||
intToStr(factionIndex) +
|
||||
".log";
|
||||
}
|
||||
bool
|
||||
executeCommandOverNetwork();
|
||||
|
||||
void
|
||||
init ();
|
||||
};
|
||||
void
|
||||
init();
|
||||
};
|
||||
|
||||
}} //end namespace
|
||||
}
|
||||
} //end namespace
|
||||
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user