diff --git a/docs/README.compiling-linux.txt b/docs/README.compiling-linux.txt index 7c63a7a8..bfbf8453 100644 --- a/docs/README.compiling-linux.txt +++ b/docs/README.compiling-linux.txt @@ -23,15 +23,15 @@ around on the forums, e.g. http://forum.megaglest.org/?topic=1426#). The game depends on some tools and libraries to be present, before you can start compiling it: -* Standard GNU compiler and additional tools (g++ version 3.2 or later is +* Standard GNU compiler and additional tools (g++ version 4.6.3 or later is required at the moment) -* Kitware CMake 2.8 or later (used as build tool) +* Kitware CMake 2.8.2 or later (used as build tool) * X11 libraries + headers http://x.org/ -* SDL 1.2.5 or later +* SDL 2.0.0 or later http://libsdl.org/ * OpenGL @@ -46,9 +46,6 @@ start compiling it: * wxWidgets http://wxwidgets.org/ -* Xerces-C - http://xerces.apache.org/xerces-c/ - * OpenAL http://openal.org/ diff --git a/docs/README.compiling-windows.txt b/docs/README.compiling-windows.txt index b568375c..d8d2b7e1 100644 --- a/docs/README.compiling-windows.txt +++ b/docs/README.compiling-windows.txt @@ -9,7 +9,7 @@ 1. Architecture -Developed on Windows with Microsoft Visual C++ 2010 Express (free version), +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. @@ -24,15 +24,15 @@ On Debian GNU/Linux systems please find license information in: To build the game, the following tools and libraries must be present: -* Microsoft Visual C++ Express 2010 +* Microsoft Visual Studio Community 2015 OR * mingw32 * Experiemtnal Microsoft Visual C++ Express 2012 projects also exist in the vc2012 folder -* MegaGlest Windows 32 bit dependencies for building with VC++: - https://github.com/MegaGlest/megaglest-source/releases/download/3.2.3/windows_deps.7z +* MegaGlest dependencies for building with VC++, which which will be downloaded + automatically in 'Option A' (see below) OR * MegaGlest Windows 32 bit dependencies for building with mingw: https://github.com/MegaGlest/megaglest-source/releases/download/3.2.3/win32_deps_mingw.7z @@ -58,7 +58,7 @@ Option A) (recommended) Automated build on the command line: 2. cd mk\windoze -3. build-mg-2010.bat (build-mg-2012.bat for vc 2012) +3. build-mg-2015.bat (or build-mg32bit-2015.bat for 32 bit build) 4. megaglest.exe --version @@ -66,19 +66,20 @@ Option A) (recommended) Automated build on the command line: Option B) Using VC++ IDE: -1. Download the dependencies archive listed above and decompress its contents - into the 'source' directory (where you see glest_game, g3d_viewer, etc). - This should create a subdirectory called "win32_deps" with many files and +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++ 2010 IDE and open the solution file: - \mk\windoze\Glest-2010.sln +2. Start the Visual C++ 2015 IDE and open the solution file: + \mk\windoze\Glest_vc2015.sln 3. Right Click on the top level 'Glest' node in Solution Explorer and select - 'Rebuild All'. + 'Rebuild All' (choose release mode or release with debug info). -If you had no errors all binaries will be created in \data\glest_game. -Before running MegaGlest you must run CopyWindowsRuntimeDlls_2010.bat. +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. diff --git a/docs/README.release-management.txt b/docs/README.release-management.txt index 75014c07..d7f0baeb 100644 --- a/docs/README.release-management.txt +++ b/docs/README.release-management.txt @@ -33,8 +33,8 @@ To build this archive open a terminal and from the mk/linux folder run: This will produce megaglest-source-.tar.xz in the release subfolder #2. The embedded source archive: -This archive contains 3rd party source code for binary compilation of the application and -tools (which is often already included in Linux distros) +This archive contains 3rd party source code for binary (and data) compilation of the +application and tools (which is often already included in Linux distros) The naming convention for the source archive is: megaglest-source-embedded-.tar.xz @@ -100,37 +100,22 @@ Linux Installer(s): mojosetup on the platform that is building the installer. For either 32 or 64 bit Linux installers open a terminal and navigate to: +mk/linux/tools-for-standalone-client/installer -mk/linux/mojosetup - -mkdir build -cd build -cmake ../ -make -cd ../ - ------------------------ --- deprecation start -- -NOTE this part is now deprecated as it is handled by the synch script above -but the info is left here for education - -#2 Navigate into the megaglest-installer subfolder and modify / save changes: +#2 Occasionally navigate into the 'scripts' subfolder and modify / save changes: - config.lua local GAME_INSTALL_SIZE = 680000000; -local GAME_VERSION = "3.6.0"; --- deprecation end -- ---------------------- -Now in a terminal session from inside the megaglest-installer folder run: + ------------------------ +Now in a terminal session from inside the 'installer' folder run: ./make.sh When complete this will produce the platform specific installer in the same -folder called: +folder called: -MegaGlest-Installer__.run +MegaGlest-Installer___.run -This is a native binary installer that wil install MegaGlest on the same +This is a native binary installer that wil install MegaGlest on the same platform as was sued to build it. (ie: 32 or 64 bit Linux) - diff --git a/docs/README.txt b/docs/README.txt index 3d4a7a37..e4484057 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -24,7 +24,7 @@ 1. System requirements Hardware requirements: -* >= 6th generation x86 CPU with 1.5 GHz or better +* >= 6th generation x86 CPU with 2.0 GHz or better (modern CPU series with at least two cores of at least 1.5 Ghz recommended) * 1.5 GB RAM (2.0 GB RAM recommended) @@ -90,7 +90,7 @@ the administrative user (root) or via sudo, but as a normal (restricted) user. The graphical installer will show up and display the MegaGlest license. Install the game into a directory below your home directory (the default location of -~/.megaglest is fine) or any location of your choice (within the boundaries of +~/megaglest is fine) or any location of your choice (within the boundaries of where your Linux user may write to). Once the installer completes, a MegaGlest starter/shortcut will show up on your window managers' application menu. @@ -216,8 +216,8 @@ network slots and the other players have to join. The best ways to find people to play a multi-player game are: a) using the Internet Game menu -b) scheduling a game on the Glest forums -c) finding other players on the #megaglest IRC channel on irc.freenode.net. +b) scheduling a game on the MegaGlest forums +c) finding other players on the #megaglest-lobby IRC channel on irc.freenode.net. For LAN play, clients may click the 'Find LAN games' menu item to find servers with an open network slot on the local network (this uses UDP broadcasting).