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

@@ -90,3 +90,6 @@ $RECYCLE.BIN/
 *.msi
 *.pdb
 #
+/mk/linux/zetaglest
+/mk/linux/zetaglest_editor
+/mk/linux/zetaglest_g3dviewer

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
@@ -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_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/mk/windows/glest.ico")
-	SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windoze/megaglest.ico")
+	SET(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/mk/windows/megaglest.ico")
 	SET(CPACK_NSIS_URL_INFO_ABOUT "http://megaglest.org")
 ENDIF()
 

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/<OS> directory, and run:
 
-    ./build-mg.sh
+    ./build-zg.sh
 
 To run the game, you will need to specify the data path:
 
-    ./megaglest --data-path=<path to data repository>zetaglest-data/
+    ./zetaglest --data-path=<path to data repository>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)

docs/README.compiling-windows.txt

@@ -54,7 +54,7 @@ To build and install the game proceed as follows:
 
 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).

mk/linux/build-zg.sh

@@ -335,8 +335,8 @@ else
         echo ''
         echo 'BUILD COMPLETE.'
         echo ''
-        echo 'To launch MegaGlest from the current directory, use:'
+        echo 'To launch ZetaGlest from the current directory, use:'
-        echo '  ./megaglest'
+        echo '  ./zetaglest'
         #echo 'Or change into mk/linux and run it from there:'
         #echo '  ./megaglest --ini-path=./ --data-path=./'
 fi

mk/linux/mg-version-synch.sh

@@ -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
+grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi
-sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/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
+	grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestInstaller.nsi
-	sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/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
+	grep -E '^\!define APVER [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi
-	sed -i 's/^\!define APVER [^"]*$/\!define APVER '$CURRENT_VERSION'/' ../windoze/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
+	grep -E '^\!define APVER_OLD [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi
-	sed -i 's/^\!define APVER_OLD [^"]*$/\!define APVER_OLD '$OLD_VERSION'/' ../windoze/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
+	grep -E '^\!define APVER_UPDATE [^"]*$' ../windows/Installer/MegaGlestUpdater.nsi
-	sed -i 's/^\!define APVER_UPDATE [^"]*$/\!define APVER_UPDATE '$CURRENT_VERSION'/' ../windoze/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

mk/windows/build-mg-2010.bat

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

mk/windows/build-mg-2012.bat

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

mk/windows/build-mg-2015.bat

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

mk/windows/build-mg32bit-2015.bat

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

mk/windows/coverity-scan.bat

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

source/g3d_viewer/CMakeLists.txt

@@ -1,11 +1,11 @@
 # 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}")
@@ -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")
 

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

source/glest_game/global/config.cpp

@@ -216,7 +216,7 @@ Config::Config(std::pair<ConfigType,ConfigType> type, std::pair<string,string> 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);

source/glest_map_editor/CMakeLists.txt

@@ -1,11 +1,11 @@
 # 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}")
@@ -176,7 +176,7 @@ 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")