From 45bccef4a99f2c9993e2f9803443b4ed03ad5aaf Mon Sep 17 00:00:00 2001 From: andy5995 Date: Sun, 14 Jan 2018 11:17:14 -0600 Subject: [PATCH] change build target to "zetaglest" * add dependency info to README * rename script * renamed windoze to windows At some point, it will be better to split off the installation instructions from the README. --- .gitignore | 3 ++ CMakeLists.txt | 12 +++--- README.md | 38 ++++++++++++++++-- docs/README.compiling-windows.txt | 30 +++++++------- mk/linux/{build-mg.sh => build-zg.sh} | 6 +-- mk/linux/mg-version-synch.sh | 32 +++++++-------- mk/{windoze => windows}/.gitignore | 0 .../CopyWindowsRuntimeDlls_2010.bat | 0 .../CopyWindowsRuntimeDlls_2012.bat | 0 .../CopyWindowsRuntimeDlls_2015.bat | 0 mk/{windoze => windows}/Glest_vc2010.sln | 0 mk/{windoze => windows}/Glest_vc2012.sln | 0 mk/{windoze => windows}/Glest_vc2015.sln | 0 .../Installer/MegaGlestInstaller.nsi | 0 .../Installer/MegaGlestUpdater.nsi | 0 .../Installer/make_installer.sh | 0 .../Installer/megaglestinstallscreen.jpg | Bin .../NetworkThrottleFix.reg | 0 mk/{windoze => windows}/build-mg-2010.bat | 4 +- mk/{windoze => windows}/build-mg-2012.bat | 4 +- mk/{windoze => windows}/build-mg-2015.bat | 4 +- mk/{windoze => windows}/build-mg-mingw.bat | 0 .../build-mg32bit-2015.bat | 4 +- mk/{windoze => windows}/coverity-scan.bat | 6 +-- mk/{windoze => windows}/g2xml.vcxproj | 0 mk/{windoze => windows}/g3d_viewer.rc | 0 mk/{windoze => windows}/g3d_viewer.vcxproj | 0 mk/{windoze => windows}/getTools.vbs | 0 mk/{windoze => windows}/glest-dev.ini | 0 mk/{windoze => windows}/glest.ini | 0 mk/{windoze => windows}/glest.rc | 0 mk/{windoze => windows}/glest_editor.rc | 0 mk/{windoze => windows}/glest_editor.vcxproj | 0 mk/{windoze => windows}/glest_game.vcxproj | 0 mk/{windoze => windows}/libstreflop.vcxproj | 0 .../make-binary-archive.bat | 0 .../make-binary-archive32bit.bat | 0 mk/{windoze => windows}/make-data-archive.bat | 0 .../megaglest_tests.vcxproj | 0 .../mg_build_breakpad_stacktrace.bat | 0 .../mg_build_breakpad_symbols.bat | 0 mk/{windoze => windows}/shared_lib.vcxproj | 0 mk/{windoze => windows}/symbolstore.py | 0 mk/{windoze => windows}/vc2012/g2xml.vcxproj | 0 .../vc2012/g3d_viewer.vcxproj | 0 .../vc2012/glest_editor.vcxproj | 0 .../vc2012/glest_game.vcxproj | 0 .../vc2012/libstreflop.vcxproj | 0 .../vc2012/megaglest_tests.vcxproj | 0 .../vc2012/shared_lib.vcxproj | 0 mk/{windoze => windows}/vc2012/xml2g.vcxproj | 0 mk/{windoze => windows}/vc2015/g2xml.vcxproj | 0 .../vc2015/g3d_viewer.vcxproj | 0 .../vc2015/glest_editor.vcxproj | 0 .../vc2015/glest_game.vcxproj | 0 .../vc2015/libstreflop.vcxproj | 0 .../vc2015/megaglest_tests.vcxproj | 0 .../vc2015/shared_lib.vcxproj | 0 mk/{windoze => windows}/vc2015/xml2g.vcxproj | 0 mk/{windoze => windows}/xml2g.vcxproj | 0 source/g3d_viewer/CMakeLists.txt | 26 ++++++------ source/glest_game/CMakeLists.txt | 22 +++++----- source/glest_game/global/config.cpp | 2 +- source/glest_map_editor/CMakeLists.txt | 28 ++++++------- 64 files changed, 128 insertions(+), 93 deletions(-) rename mk/linux/{build-mg.sh => build-zg.sh} (99%) rename mk/{windoze => windows}/.gitignore (100%) rename mk/{windoze => windows}/CopyWindowsRuntimeDlls_2010.bat (100%) rename mk/{windoze => windows}/CopyWindowsRuntimeDlls_2012.bat (100%) rename mk/{windoze => windows}/CopyWindowsRuntimeDlls_2015.bat (100%) rename mk/{windoze => windows}/Glest_vc2010.sln (100%) rename mk/{windoze => windows}/Glest_vc2012.sln (100%) rename mk/{windoze => windows}/Glest_vc2015.sln (100%) rename mk/{windoze => windows}/Installer/MegaGlestInstaller.nsi (100%) rename mk/{windoze => windows}/Installer/MegaGlestUpdater.nsi (100%) rename mk/{windoze => windows}/Installer/make_installer.sh (100%) rename mk/{windoze => windows}/Installer/megaglestinstallscreen.jpg (100%) rename mk/{windoze => windows}/NetworkThrottleFix.reg (100%) rename mk/{windoze => windows}/build-mg-2010.bat (99%) rename mk/{windoze => windows}/build-mg-2012.bat (99%) rename mk/{windoze => windows}/build-mg-2015.bat (99%) rename mk/{windoze => windows}/build-mg-mingw.bat (100%) rename mk/{windoze => windows}/build-mg32bit-2015.bat (99%) rename mk/{windoze => windows}/coverity-scan.bat (97%) rename mk/{windoze => windows}/g2xml.vcxproj (100%) rename mk/{windoze => windows}/g3d_viewer.rc (100%) rename mk/{windoze => windows}/g3d_viewer.vcxproj (100%) rename mk/{windoze => windows}/getTools.vbs (100%) rename mk/{windoze => windows}/glest-dev.ini (100%) rename mk/{windoze => windows}/glest.ini (100%) rename mk/{windoze => windows}/glest.rc (100%) rename mk/{windoze => windows}/glest_editor.rc (100%) rename mk/{windoze => windows}/glest_editor.vcxproj (100%) rename mk/{windoze => windows}/glest_game.vcxproj (100%) rename mk/{windoze => windows}/libstreflop.vcxproj (100%) rename mk/{windoze => windows}/make-binary-archive.bat (100%) rename mk/{windoze => windows}/make-binary-archive32bit.bat (100%) rename mk/{windoze => windows}/make-data-archive.bat (100%) rename mk/{windoze => windows}/megaglest_tests.vcxproj (100%) rename mk/{windoze => windows}/mg_build_breakpad_stacktrace.bat (100%) rename mk/{windoze => windows}/mg_build_breakpad_symbols.bat (100%) rename mk/{windoze => windows}/shared_lib.vcxproj (100%) rename mk/{windoze => windows}/symbolstore.py (100%) rename mk/{windoze => windows}/vc2012/g2xml.vcxproj (100%) rename mk/{windoze => windows}/vc2012/g3d_viewer.vcxproj (100%) rename mk/{windoze => windows}/vc2012/glest_editor.vcxproj (100%) rename mk/{windoze => windows}/vc2012/glest_game.vcxproj (100%) rename mk/{windoze => windows}/vc2012/libstreflop.vcxproj (100%) rename mk/{windoze => windows}/vc2012/megaglest_tests.vcxproj (100%) rename mk/{windoze => windows}/vc2012/shared_lib.vcxproj (100%) rename mk/{windoze => windows}/vc2012/xml2g.vcxproj (100%) rename mk/{windoze => windows}/vc2015/g2xml.vcxproj (100%) rename mk/{windoze => windows}/vc2015/g3d_viewer.vcxproj (100%) rename mk/{windoze => windows}/vc2015/glest_editor.vcxproj (100%) rename mk/{windoze => windows}/vc2015/glest_game.vcxproj (100%) rename mk/{windoze => windows}/vc2015/libstreflop.vcxproj (100%) rename mk/{windoze => windows}/vc2015/megaglest_tests.vcxproj (100%) rename mk/{windoze => windows}/vc2015/shared_lib.vcxproj (100%) rename mk/{windoze => windows}/vc2015/xml2g.vcxproj (100%) rename mk/{windoze => windows}/xml2g.vcxproj (100%) diff --git a/.gitignore b/.gitignore index 345be39f5..cbab25ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,6 @@ $RECYCLE.BIN/ *.msi *.pdb # +/mk/linux/zetaglest +/mk/linux/zetaglest_editor +/mk/linux/zetaglest_g3dviewer diff --git a/CMakeLists.txt b/CMakeLists.txt index d6d7e5dc2..0714e4ef3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ PROJECT( MegaGlest ) # # *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/windoze +# VC++ users should not use CMake yet but rather the build-mg.bat file in mk/windows # # build type @@ -137,7 +137,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) # ENDIF() ENDIF() - #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") #MESSAGE(STATUS "*TEST: Checking for max SSE LEVEL [${FORCE_MAX_SSE_LEVEL}]") OPTION(FORCE_STREFLOP_SOFTWRAPPER "Set the streflop library to be forced to use the software emulator" OFF) @@ -230,7 +230,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) include(FindGit) IF(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git/") - SET(HAS_GIT "TRUE") + SET(HAS_GIT "TRUE") MESSAGE(STATUS "Found GIT and using GIT version stamping...") # Get the current commit SHA1 @@ -320,7 +320,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) ENDIF() SET(CMAKE_CXX_FLAGS_${MG_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${MG_BUILD_TYPE}} ${CUSTOM_INSTALL_PATHS_VALUES}") - # We do some funky character escaping to get the right stuff written out to + # 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}}") @@ -455,8 +455,8 @@ IF("${CPACK_GENERATOR}" STREQUAL "DEB") ENDIF() IF("${CPACK_GENERATOR}" STREQUAL "NSIS") SET(CPACK_NSIS_DISPLAY_NAME "MegaGlest") - SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/glest.ico") - SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/megaglest.ico") + SET(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windows/glest.ico") + SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windows/megaglest.ico") SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org") ENDIF() diff --git a/README.md b/README.md index d3cb5d503..f274e401b 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,33 @@ available on their web site. ## To Build (Compile) and Run +### Dependencies + +On Debian, Ubuntu, Fedora, Opensuse and even more Linux distributions, +after you clone the source repository, you may use + + cd mk/linux + sudo ./setupBuildDeps.sh + +which will run your package manager and attempt to install the needed packages. + +(These may vary based on your operating system or Linux distribution; +we will attempt to document dependencies in more detail) + +Below is a list of most dependencies you will need. This document needs +to indicate better which are optional and which are required. + +gcc gcc-c++ cmake libsdl2-dev libalut-dev libgl1-mesa-dev +libglu1-mesa-dev libvorbis-dev libx11-dev liblua-dev libjpeg-dev +libpng-dev libcurl-gnutls-dev libircclient-dev libglew-dev libftgl-dev +libfribidi-dev libcppunit-dev libminiupnpc-dev libfreetype6-dev +libgnutls28-dev libkrb5-dev libkrb5-dev libnghttp2-dev libopenal-dev +libldap2-dev libwxgtk3.0-dev librtmp-dev libvlccore-dev libvlc-dev + +Additionally for map editor and model viewer: + +libwxgtk3.0-dev libxml2-dev + ### Try the game without contributing Use this command: @@ -32,7 +59,11 @@ Use this command: Afterward, to build, change to the mk/ directory, select your operating system and run - ./build-mg.sh + ./build-zg.sh + +To execute the game: + + ./zetaglest ### Contributing and Testing @@ -46,11 +77,11 @@ clone these 3 repositories: Afterward, to build, change to the zetaglest-source/mk/ directory, and run: - ./build-mg.sh + ./build-zg.sh To run the game, you will need to specify the data path: - ./megaglest --data-path=zetaglest-data/ + ./zetaglest --data-path=zetaglest-data/ If you don't provide the data path, you will receive an error message when the game starts. @@ -62,3 +93,4 @@ for extended, important instructions and guidelines for contributing. * IRC: [Freenode/#zetaglest-dev](http://webchat.freenode.net?channels=%23zetaglest-dev&uio=d4) * email: andy400-dev@yahoo.com +* (Suggest alternate methods of communication) diff --git a/docs/README.compiling-windows.txt b/docs/README.compiling-windows.txt index 4e7e070a4..292c19375 100644 --- a/docs/README.compiling-windows.txt +++ b/docs/README.compiling-windows.txt @@ -13,7 +13,7 @@ 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: +On Debian GNU/Linux systems please find license information in: /usr/share/common-licenses Also see Build Instructions for Linux @@ -30,7 +30,7 @@ To build the game, the following tools and libraries must be present: folder) * mingw32 http://mingw.org/ - + - Pick 1: * MegaGlest dependencies for building with VC++, which which will be downloaded automatically in 'Option A' (see below) @@ -50,11 +50,11 @@ To build the game, the following tools and libraries must be present: To build and install the game proceed as follows: -*** Option A ~ (recommended) Automated build on the command line: +*** 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\windoze +2. cd mk\windows 3. build-mg-2015.bat (or build-mg32bit-2015.bat for 32 bit build) @@ -71,7 +71,7 @@ To build and install the game proceed as follows: subdirectories in it. 2. Start the Visual C++ 2015 IDE and open the solution file: - \mk\windoze\Glest_vc2015.sln + \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). @@ -92,12 +92,12 @@ directory tree the %AppData% environment variable points to. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 3. Troubleshooting ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- General --- -* Make sure that the hardware and software of your system match the +* 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 @@ -109,15 +109,15 @@ directory tree the %AppData% environment variable points to. * 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 +--- 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 +* 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 @@ -141,11 +141,11 @@ directory tree the %AppData% environment variable points to. http://glest.org/ * Linux port by: - Matthias Braun - - - with help from - + Matthias Braun + + + with help from + Karl Robillard diff --git a/mk/linux/build-mg.sh b/mk/linux/build-zg.sh similarity index 99% rename from mk/linux/build-mg.sh rename to mk/linux/build-zg.sh index 5979940c1..aa6be180b 100755 --- a/mk/linux/build-mg.sh +++ b/mk/linux/build-zg.sh @@ -61,7 +61,7 @@ while getopts "c:defg:hl:mnswx" option; do echo " -l x : Force using LUA version x - example: -l 5.3" echo " -m : Force running CMAKE only to create Make files (do not compile)" echo " -n : Force running MAKE only to compile (assume CMAKE already built make files)" - echo " -s : Force compilation of wxWidgets STATIC libs" + echo " -s : Force compilation of wxWidgets STATIC libs" echo " -w : Force compilation 'Without using wxWidgets'" echo " -x : Force cross compiling on x64 linux to produce an x86 32 bit binary" @@ -335,8 +335,8 @@ else echo '' echo 'BUILD COMPLETE.' echo '' - echo 'To launch MegaGlest from the current directory, use:' - echo ' ./megaglest' + echo 'To launch ZetaGlest from the current directory, use:' + echo ' ./zetaglest' #echo 'Or change into mk/linux and run it from there:' #echo ' ./megaglest --ini-path=./ --data-path=./' fi diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index 1fbfd9f2e..5a4ac7316 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Use this script to synchronize other scripts and installers with the version +# Use this script to synchronize other scripts and installers with the version # in mg-version.sh for a Version Release # ---------------------------------------------------------------------------- # Written by Mark Vejvoda @@ -90,35 +90,35 @@ echo echo '===== Updating Windows Installer ======' # !define APVER 3.6.0 echo 'Windows Installer version # before:' -grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi -sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi +grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi +sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windows/Installer/MegaGlestInstaller.nsi echo 'Windows Installer version # after:' -grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi +grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi echo if [ "$modifymore" = "yes" ]; then echo 'Windows Installer version # before:' - grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi - sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestInstaller.nsi + grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi + sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windows/Installer/MegaGlestInstaller.nsi echo 'Windows Installer version # after:' - grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestInstaller.nsi + grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi echo echo '===== Updating Windows Updater ======' echo 'Windows Updater version # before:' - grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi - sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi + grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi + sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windows/Installer/MegaGlestUpdater.nsi echo 'Windows Updater version # after:' - grep -E '^\!define APVER [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi echo echo 'Windows Updater version # before:' - grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi - sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi + grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi + sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windows/Installer/MegaGlestUpdater.nsi echo 'Windows Updater version # after:' - grep -E '^\!define APVER_OLD [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi echo echo 'Windows Updater version # before:' - grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi - sed -i 's/^\!define APVER_UPDATE [^"]*$/\!define APVER_UPDATE '$CURRENT_VERSION'/' ../windoze/Installer/MegaGlestUpdater.nsi + grep -E '^\!define APVER_UPDATE [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi + sed -i 's/^\!define APVER_UPDATE [^"]*$/\!define APVER_UPDATE '$CURRENT_VERSION'/' ../windows/Installer/MegaGlestUpdater.nsi echo 'Windows Updater version # after:' - grep -E '^\!define APVER_UPDATE [^"]*$' ../windoze/Installer/MegaGlestUpdater.nsi + grep -E '^\!define APVER_UPDATE [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi echo fi diff --git a/mk/windoze/.gitignore b/mk/windows/.gitignore similarity index 100% rename from mk/windoze/.gitignore rename to mk/windows/.gitignore diff --git a/mk/windoze/CopyWindowsRuntimeDlls_2010.bat b/mk/windows/CopyWindowsRuntimeDlls_2010.bat similarity index 100% rename from mk/windoze/CopyWindowsRuntimeDlls_2010.bat rename to mk/windows/CopyWindowsRuntimeDlls_2010.bat diff --git a/mk/windoze/CopyWindowsRuntimeDlls_2012.bat b/mk/windows/CopyWindowsRuntimeDlls_2012.bat similarity index 100% rename from mk/windoze/CopyWindowsRuntimeDlls_2012.bat rename to mk/windows/CopyWindowsRuntimeDlls_2012.bat diff --git a/mk/windoze/CopyWindowsRuntimeDlls_2015.bat b/mk/windows/CopyWindowsRuntimeDlls_2015.bat similarity index 100% rename from mk/windoze/CopyWindowsRuntimeDlls_2015.bat rename to mk/windows/CopyWindowsRuntimeDlls_2015.bat diff --git a/mk/windoze/Glest_vc2010.sln b/mk/windows/Glest_vc2010.sln similarity index 100% rename from mk/windoze/Glest_vc2010.sln rename to mk/windows/Glest_vc2010.sln diff --git a/mk/windoze/Glest_vc2012.sln b/mk/windows/Glest_vc2012.sln similarity index 100% rename from mk/windoze/Glest_vc2012.sln rename to mk/windows/Glest_vc2012.sln diff --git a/mk/windoze/Glest_vc2015.sln b/mk/windows/Glest_vc2015.sln similarity index 100% rename from mk/windoze/Glest_vc2015.sln rename to mk/windows/Glest_vc2015.sln diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windows/Installer/MegaGlestInstaller.nsi similarity index 100% rename from mk/windoze/Installer/MegaGlestInstaller.nsi rename to mk/windows/Installer/MegaGlestInstaller.nsi diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windows/Installer/MegaGlestUpdater.nsi similarity index 100% rename from mk/windoze/Installer/MegaGlestUpdater.nsi rename to mk/windows/Installer/MegaGlestUpdater.nsi diff --git a/mk/windoze/Installer/make_installer.sh b/mk/windows/Installer/make_installer.sh similarity index 100% rename from mk/windoze/Installer/make_installer.sh rename to mk/windows/Installer/make_installer.sh diff --git a/mk/windoze/Installer/megaglestinstallscreen.jpg b/mk/windows/Installer/megaglestinstallscreen.jpg similarity index 100% rename from mk/windoze/Installer/megaglestinstallscreen.jpg rename to mk/windows/Installer/megaglestinstallscreen.jpg diff --git a/mk/windoze/NetworkThrottleFix.reg b/mk/windows/NetworkThrottleFix.reg similarity index 100% rename from mk/windoze/NetworkThrottleFix.reg rename to mk/windows/NetworkThrottleFix.reg diff --git a/mk/windoze/build-mg-2010.bat b/mk/windows/build-mg-2010.bat similarity index 99% rename from mk/windoze/build-mg-2010.bat rename to mk/windows/build-mg-2010.bat index 5bcff9aea..5bbf5adcb 100644 --- a/mk/windoze/build-mg-2010.bat +++ b/mk/windows/build-mg-2010.bat @@ -13,7 +13,7 @@ if NOT EXIST .\tar.exe call cscript getTools.vbs if NOT EXIST .\wget.exe call cscript getTools.vbs set depfolder=windows_deps -set depfile=%depfolder%.7z +set depfile=%depfolder%.7z dir ..\..\source\ if NOT EXIST ..\..\source\%depfolder%\NUL echo folder not found [%depfolder%] @@ -88,7 +88,7 @@ set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] -cd mk\windoze +cd mk\windows rem pause ECHO -------------------------------- diff --git a/mk/windoze/build-mg-2012.bat b/mk/windows/build-mg-2012.bat similarity index 99% rename from mk/windoze/build-mg-2012.bat rename to mk/windows/build-mg-2012.bat index 1bd489ce0..70b526e1f 100644 --- a/mk/windoze/build-mg-2012.bat +++ b/mk/windows/build-mg-2012.bat @@ -20,7 +20,7 @@ if NOT EXIST .\tar.exe call cscript getTools.vbs if NOT EXIST .\wget.exe call cscript getTools.vbs set depfolder=windows_deps_2012 -set depfile=windows_deps_2012_x64.7z +set depfile=windows_deps_2012_x64.7z dir ..\..\source\ if NOT EXIST ..\..\source\%depfolder%\NUL echo folder not found [%depfolder%] @@ -112,7 +112,7 @@ set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] -cd mk\windoze +cd mk\windows rem pause ECHO -------------------------------- diff --git a/mk/windoze/build-mg-2015.bat b/mk/windows/build-mg-2015.bat similarity index 99% rename from mk/windoze/build-mg-2015.bat rename to mk/windows/build-mg-2015.bat index 466d39e66..f1944efe1 100644 --- a/mk/windoze/build-mg-2015.bat +++ b/mk/windows/build-mg-2015.bat @@ -21,7 +21,7 @@ if NOT EXIST .\tar.exe call cscript getTools.vbs if NOT EXIST .\wget.exe call cscript getTools.vbs set depfolder=windows_deps_2015 -set depfile=windows_deps_2015_x64.7z +set depfile=windows_deps_2015_x64.7z dir ..\..\source\ if NOT EXIST ..\..\source\%depfolder%\NUL echo folder not found [%depfolder%] @@ -100,7 +100,7 @@ set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] -cd mk\windoze +cd mk\windows rem pause ECHO -------------------------------- diff --git a/mk/windoze/build-mg-mingw.bat b/mk/windows/build-mg-mingw.bat similarity index 100% rename from mk/windoze/build-mg-mingw.bat rename to mk/windows/build-mg-mingw.bat diff --git a/mk/windoze/build-mg32bit-2015.bat b/mk/windows/build-mg32bit-2015.bat similarity index 99% rename from mk/windoze/build-mg32bit-2015.bat rename to mk/windows/build-mg32bit-2015.bat index a0269a78a..edee60acb 100644 --- a/mk/windoze/build-mg32bit-2015.bat +++ b/mk/windows/build-mg32bit-2015.bat @@ -15,7 +15,7 @@ if NOT EXIST .\tar.exe call cscript getTools.vbs if NOT EXIST .\wget.exe call cscript getTools.vbs set depfolder=windows_deps_2015 -set depfile=windows_deps_2015_x86.7z +set depfile=windows_deps_2015_x86.7z dir ..\..\source\ if NOT EXIST ..\..\source\%depfolder%\NUL echo folder not found [%depfolder%] @@ -94,7 +94,7 @@ set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] -cd mk\windoze +cd mk\windows rem pause ECHO -------------------------------- diff --git a/mk/windoze/coverity-scan.bat b/mk/windows/coverity-scan.bat similarity index 97% rename from mk/windoze/coverity-scan.bat rename to mk/windows/coverity-scan.bat index dc25bf94c..ef0b59cf9 100644 --- a/mk/windoze/coverity-scan.bat +++ b/mk/windows/coverity-scan.bat @@ -48,8 +48,8 @@ set BUILDTOOL=cov-int rem ------------------------------------------------------------------------------ echo PROJECT [%PROJECT%] -echo EMAIL [%EMAIL%] -echo TOKEN [%TOKEN%] +echo EMAIL [%EMAIL%] +echo TOKEN [%TOKEN%] echo COVERITY_ANALYSIS_ROOT [%COVERITY_ANALYSIS_ROOT%] echo BITNESS [%BITNESS%] echo DESCRIPTION [%DESCRIPTION%] @@ -70,7 +70,7 @@ set FILENAME=%PROJECT%_%DESCRIPTION%_%VERSION% rem Untested! Requires modification. rem wget.exe --no-check-certificate https://scan.coverity.com/download/win-32 --post-data "token=%TOKEN%&project=%PROJECT%" -O %TEMP%\coverity_tool.zip rem 7z.exe x %TEMP%\coverity_tool.zip -rem set PATH=%PATH%;C:\build\megaglest-source\mk\windoze\cov-analysis-win32-6.6.1\bin\ +rem set PATH=%PATH%;C:\build\megaglest-source\mk\windows\cov-analysis-win32-6.6.1\bin\ if "%MG_COV_PATH_SET%." == "." set PATH=%PATH%;%COVERITY_ANALYSIS_ROOT%\bin\ set MG_COV_PATH_SET=TRUE diff --git a/mk/windoze/g2xml.vcxproj b/mk/windows/g2xml.vcxproj similarity index 100% rename from mk/windoze/g2xml.vcxproj rename to mk/windows/g2xml.vcxproj diff --git a/mk/windoze/g3d_viewer.rc b/mk/windows/g3d_viewer.rc similarity index 100% rename from mk/windoze/g3d_viewer.rc rename to mk/windows/g3d_viewer.rc diff --git a/mk/windoze/g3d_viewer.vcxproj b/mk/windows/g3d_viewer.vcxproj similarity index 100% rename from mk/windoze/g3d_viewer.vcxproj rename to mk/windows/g3d_viewer.vcxproj diff --git a/mk/windoze/getTools.vbs b/mk/windows/getTools.vbs similarity index 100% rename from mk/windoze/getTools.vbs rename to mk/windows/getTools.vbs diff --git a/mk/windoze/glest-dev.ini b/mk/windows/glest-dev.ini similarity index 100% rename from mk/windoze/glest-dev.ini rename to mk/windows/glest-dev.ini diff --git a/mk/windoze/glest.ini b/mk/windows/glest.ini similarity index 100% rename from mk/windoze/glest.ini rename to mk/windows/glest.ini diff --git a/mk/windoze/glest.rc b/mk/windows/glest.rc similarity index 100% rename from mk/windoze/glest.rc rename to mk/windows/glest.rc diff --git a/mk/windoze/glest_editor.rc b/mk/windows/glest_editor.rc similarity index 100% rename from mk/windoze/glest_editor.rc rename to mk/windows/glest_editor.rc diff --git a/mk/windoze/glest_editor.vcxproj b/mk/windows/glest_editor.vcxproj similarity index 100% rename from mk/windoze/glest_editor.vcxproj rename to mk/windows/glest_editor.vcxproj diff --git a/mk/windoze/glest_game.vcxproj b/mk/windows/glest_game.vcxproj similarity index 100% rename from mk/windoze/glest_game.vcxproj rename to mk/windows/glest_game.vcxproj diff --git a/mk/windoze/libstreflop.vcxproj b/mk/windows/libstreflop.vcxproj similarity index 100% rename from mk/windoze/libstreflop.vcxproj rename to mk/windows/libstreflop.vcxproj diff --git a/mk/windoze/make-binary-archive.bat b/mk/windows/make-binary-archive.bat similarity index 100% rename from mk/windoze/make-binary-archive.bat rename to mk/windows/make-binary-archive.bat diff --git a/mk/windoze/make-binary-archive32bit.bat b/mk/windows/make-binary-archive32bit.bat similarity index 100% rename from mk/windoze/make-binary-archive32bit.bat rename to mk/windows/make-binary-archive32bit.bat diff --git a/mk/windoze/make-data-archive.bat b/mk/windows/make-data-archive.bat similarity index 100% rename from mk/windoze/make-data-archive.bat rename to mk/windows/make-data-archive.bat diff --git a/mk/windoze/megaglest_tests.vcxproj b/mk/windows/megaglest_tests.vcxproj similarity index 100% rename from mk/windoze/megaglest_tests.vcxproj rename to mk/windows/megaglest_tests.vcxproj diff --git a/mk/windoze/mg_build_breakpad_stacktrace.bat b/mk/windows/mg_build_breakpad_stacktrace.bat similarity index 100% rename from mk/windoze/mg_build_breakpad_stacktrace.bat rename to mk/windows/mg_build_breakpad_stacktrace.bat diff --git a/mk/windoze/mg_build_breakpad_symbols.bat b/mk/windows/mg_build_breakpad_symbols.bat similarity index 100% rename from mk/windoze/mg_build_breakpad_symbols.bat rename to mk/windows/mg_build_breakpad_symbols.bat diff --git a/mk/windoze/shared_lib.vcxproj b/mk/windows/shared_lib.vcxproj similarity index 100% rename from mk/windoze/shared_lib.vcxproj rename to mk/windows/shared_lib.vcxproj diff --git a/mk/windoze/symbolstore.py b/mk/windows/symbolstore.py similarity index 100% rename from mk/windoze/symbolstore.py rename to mk/windows/symbolstore.py diff --git a/mk/windoze/vc2012/g2xml.vcxproj b/mk/windows/vc2012/g2xml.vcxproj similarity index 100% rename from mk/windoze/vc2012/g2xml.vcxproj rename to mk/windows/vc2012/g2xml.vcxproj diff --git a/mk/windoze/vc2012/g3d_viewer.vcxproj b/mk/windows/vc2012/g3d_viewer.vcxproj similarity index 100% rename from mk/windoze/vc2012/g3d_viewer.vcxproj rename to mk/windows/vc2012/g3d_viewer.vcxproj diff --git a/mk/windoze/vc2012/glest_editor.vcxproj b/mk/windows/vc2012/glest_editor.vcxproj similarity index 100% rename from mk/windoze/vc2012/glest_editor.vcxproj rename to mk/windows/vc2012/glest_editor.vcxproj diff --git a/mk/windoze/vc2012/glest_game.vcxproj b/mk/windows/vc2012/glest_game.vcxproj similarity index 100% rename from mk/windoze/vc2012/glest_game.vcxproj rename to mk/windows/vc2012/glest_game.vcxproj diff --git a/mk/windoze/vc2012/libstreflop.vcxproj b/mk/windows/vc2012/libstreflop.vcxproj similarity index 100% rename from mk/windoze/vc2012/libstreflop.vcxproj rename to mk/windows/vc2012/libstreflop.vcxproj diff --git a/mk/windoze/vc2012/megaglest_tests.vcxproj b/mk/windows/vc2012/megaglest_tests.vcxproj similarity index 100% rename from mk/windoze/vc2012/megaglest_tests.vcxproj rename to mk/windows/vc2012/megaglest_tests.vcxproj diff --git a/mk/windoze/vc2012/shared_lib.vcxproj b/mk/windows/vc2012/shared_lib.vcxproj similarity index 100% rename from mk/windoze/vc2012/shared_lib.vcxproj rename to mk/windows/vc2012/shared_lib.vcxproj diff --git a/mk/windoze/vc2012/xml2g.vcxproj b/mk/windows/vc2012/xml2g.vcxproj similarity index 100% rename from mk/windoze/vc2012/xml2g.vcxproj rename to mk/windows/vc2012/xml2g.vcxproj diff --git a/mk/windoze/vc2015/g2xml.vcxproj b/mk/windows/vc2015/g2xml.vcxproj similarity index 100% rename from mk/windoze/vc2015/g2xml.vcxproj rename to mk/windows/vc2015/g2xml.vcxproj diff --git a/mk/windoze/vc2015/g3d_viewer.vcxproj b/mk/windows/vc2015/g3d_viewer.vcxproj similarity index 100% rename from mk/windoze/vc2015/g3d_viewer.vcxproj rename to mk/windows/vc2015/g3d_viewer.vcxproj diff --git a/mk/windoze/vc2015/glest_editor.vcxproj b/mk/windows/vc2015/glest_editor.vcxproj similarity index 100% rename from mk/windoze/vc2015/glest_editor.vcxproj rename to mk/windows/vc2015/glest_editor.vcxproj diff --git a/mk/windoze/vc2015/glest_game.vcxproj b/mk/windows/vc2015/glest_game.vcxproj similarity index 100% rename from mk/windoze/vc2015/glest_game.vcxproj rename to mk/windows/vc2015/glest_game.vcxproj diff --git a/mk/windoze/vc2015/libstreflop.vcxproj b/mk/windows/vc2015/libstreflop.vcxproj similarity index 100% rename from mk/windoze/vc2015/libstreflop.vcxproj rename to mk/windows/vc2015/libstreflop.vcxproj diff --git a/mk/windoze/vc2015/megaglest_tests.vcxproj b/mk/windows/vc2015/megaglest_tests.vcxproj similarity index 100% rename from mk/windoze/vc2015/megaglest_tests.vcxproj rename to mk/windows/vc2015/megaglest_tests.vcxproj diff --git a/mk/windoze/vc2015/shared_lib.vcxproj b/mk/windows/vc2015/shared_lib.vcxproj similarity index 100% rename from mk/windoze/vc2015/shared_lib.vcxproj rename to mk/windows/vc2015/shared_lib.vcxproj diff --git a/mk/windoze/vc2015/xml2g.vcxproj b/mk/windows/vc2015/xml2g.vcxproj similarity index 100% rename from mk/windoze/vc2015/xml2g.vcxproj rename to mk/windows/vc2015/xml2g.vcxproj diff --git a/mk/windoze/xml2g.vcxproj b/mk/windows/xml2g.vcxproj similarity index 100% rename from mk/windoze/xml2g.vcxproj rename to mk/windows/xml2g.vcxproj diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index cfed04c85..affc4be86 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -1,12 +1,12 @@ # common libraries SET(EXTERNAL_LIBS "") -SET(TARGET_NAME "megaglest_g3dviewer") +SET(TARGET_NAME "zetaglest_g3dviewer") SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6") IF(BUILD_MEGAGLEST_MODEL_VIEWER) - MESSAGE(STATUS "Will try to build MegaGlest 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") IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.7 OR NOT "${CMAKE_CXX_COMPILER_VERSION}") ADD_DEFINITIONS("-std=gnu++0x") @@ -121,7 +121,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/${SDL_WINDOWS_DIR_DINC}/include) - + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) ENDIF() @@ -167,7 +167,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/${SDL_VERSION_SNAME} ) SET(MG_SOURCE_FILES "../glest_game/graphics/particle_type.cpp" "../glest_game/graphics/unit_particle_type.cpp" "../glest_game/global/config.cpp") - + FOREACH(DIR IN LISTS DIRS_WITH_SRC) INCLUDE_DIRECTORIES( ${DIR} ) @@ -175,14 +175,14 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp) SET(MG_SOURCE_FILES ${MG_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(MG_INCLUDE_FILES ${MG_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}) 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(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) ENDIF(APPLE) ENDFOREACH(DIR) @@ -195,7 +195,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") ENDIF() - MESSAGE(STATUS "***Note: The final output path for MegaGlest G3d Viewer will be [${HELP2MAN_OUT_PATH}]") + MESSAGE(STATUS "***Note: The final output path for ZetaGlest G3d Viewer will be [${HELP2MAN_OUT_PATH}]") FIND_PROGRAM(HELP2MAN "help2man") @@ -232,21 +232,21 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) # Requires an install prefix for the items below to work IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") # Installation of the program - INSTALL(TARGETS - ${TARGET_NAME} + INSTALL(TARGETS + ${TARGET_NAME} DESTINATION ${MEGAGLEST_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}]") + MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]") # Installation of the program manpage file - INSTALL(FILES + INSTALL(FILES "${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ENDIF() # Installation of the program config and image files - INSTALL(FILES + INSTALL(FILES "${PROJECT_SOURCE_DIR}/mk/shared/g3dviewer.ico" DESTINATION ${MEGAGLEST_INI_INSTALL_PATH}) ENDIF() diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 76b5de40d..e631f576b 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -2,11 +2,11 @@ # common libraries SET(EXTERNAL_LIBS "") -SET(TARGET_NAME "megaglest") +SET(TARGET_NAME "zetaglest") SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6") IF(BUILD_MEGAGLEST) - MESSAGE(STATUS "Will try to build MegaGlest game") + MESSAGE(STATUS "Will try to build ZetaGlest game") IF(WIN32) SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} @@ -24,7 +24,7 @@ IF(BUILD_MEGAGLEST) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/${SDL_WINDOWS_DIR_DINC}/include) - + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) ENDIF() @@ -232,7 +232,7 @@ IF(BUILD_MEGAGLEST) ENDIF() SET(MG_SOURCE_FILES "") - + FOREACH(DIR IN LISTS DIRS_WITH_SRC) INCLUDE_DIRECTORIES( ${DIR} ) @@ -269,7 +269,7 @@ IF(BUILD_MEGAGLEST) SET(EXECUTABLE_OUTPUT_PATH "${MEGAGLEST_FRIENDLY_OUTPUT_PATH}") ENDIF() - MESSAGE(STATUS "***Note: The final output path for the MegaGlest engine will be [${EXECUTABLE_OUTPUT_PATH}]") + 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) @@ -329,18 +329,18 @@ IF(BUILD_MEGAGLEST) # Requires an install prefix for the items below to work IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") - MESSAGE(STATUS "**Source package INSTALL TRIGGERED [${PROJECT_SOURCE_DIR}]") + MESSAGE(STATUS "**Source package INSTALL TRIGGERED [${PROJECT_SOURCE_DIR}]") # Installation of the program - INSTALL(TARGETS - ${TARGET_NAME} + INSTALL(TARGETS + ${TARGET_NAME} DESTINATION ${MEGAGLEST_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}]") + MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]") # Installation of the program manpage file - INSTALL(FILES + INSTALL(FILES "${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ENDIF() @@ -356,7 +356,7 @@ IF(BUILD_MEGAGLEST) DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) IF(WIN32) INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/windoze/glest.ini" + "${PROJECT_SOURCE_DIR}/mk/windows/glest.ini" DESTINATION ${MEGAGLEST_INI_INSTALL_PATH}) ELSEIF(UNIX AND NOT APPLE) INSTALL(FILES diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp index a9e586ac2..a72150ad0 100644 --- a/source/glest_game/global/config.cpp +++ b/source/glest_game/global/config.cpp @@ -216,7 +216,7 @@ Config::Config(std::pair type, std::pair f } #if defined(WIN32) - //string test = "C:\\Code\\megaglest\\mk\\windoze\\.\\..\\..\\data\\glest_game\\glest.ini"; + //string test = "C:\\Code\\megaglest\\mk\\windows\\.\\..\\..\\data\\glest_game\\glest.ini"; //updatePathClimbingParts(test); updatePathClimbingParts(fileName.first); diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 2e73c0d16..cc0e9ee26 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -1,12 +1,12 @@ # common libraries SET(EXTERNAL_LIBS "") -SET(TARGET_NAME "megaglest_editor") +SET(TARGET_NAME "zetaglest_editor") SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6") IF(BUILD_MEGAGLEST_MAP_EDITOR) - MESSAGE(STATUS "Will try to build MegaGlest map editor") - + MESSAGE(STATUS "Will try to build ZetaGlest map editor") + IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.7 OR NOT "${CMAKE_CXX_COMPILER_VERSION}") ADD_DEFINITIONS("-std=gnu++0x") @@ -74,7 +74,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/zlib-1.2.5) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/curl-7.21.3/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/${SDL_WINDOWS_DIR_DINC}/include) - + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) ENDIF() @@ -148,7 +148,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/${SDL_VERSION_SNAME} ) SET(MG_SOURCE_FILES "../glest_game/global/config.cpp") - + FOREACH(DIR IN LISTS DIRS_WITH_SRC) INCLUDE_DIRECTORIES( ${DIR} ) @@ -156,14 +156,14 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp) SET(MG_SOURCE_FILES ${MG_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(MG_INCLUDE_FILES ${MG_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}) 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(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR}) ENDIF(APPLE) ENDFOREACH(DIR) @@ -176,14 +176,14 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") ENDIF() - MESSAGE(STATUS "***Note: The final output path for MegaGlest Map Editor will be [${HELP2MAN_OUT_PATH}]") + MESSAGE(STATUS "***Note: The final output path for ZetaGlest Map Editor will be [${HELP2MAN_OUT_PATH}]") FIND_PROGRAM(HELP2MAN "help2man") SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) - + SET(MG_STREFLOP "") IF(WANT_USE_STREFLOP) SET(MG_STREFLOP "streflop") @@ -222,21 +222,21 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) # Requires an install prefix for the items below to work IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") # Installation of the program - INSTALL(TARGETS - ${TARGET_NAME} + INSTALL(TARGETS + ${TARGET_NAME} DESTINATION ${MEGAGLEST_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}]") + MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]") # Installation of the program manpage file - INSTALL(FILES + INSTALL(FILES "${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ENDIF() # Installation of the program config and image files - INSTALL(FILES + INSTALL(FILES "${PROJECT_SOURCE_DIR}/mk/shared/editor.ico" DESTINATION ${MEGAGLEST_INI_INSTALL_PATH}) ENDIF()