diff --git a/.gitignore b/.gitignore index 49db33198..1a8057c67 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ Session.vim # KDevelop *.kdev4 +# Meld +*.orig ## OSX Icon diff --git a/docs/README.compiling-linux.txt b/docs/README.compiling-linux.txt index ae5d6cf62..7c63a7a88 100644 --- a/docs/README.compiling-linux.txt +++ b/docs/README.compiling-linux.txt @@ -95,8 +95,10 @@ who made our development easy and straight forward. To build the game simply invoke the build script: -./build-mg.sh +../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 diff --git a/docs/README.compiling-windows.txt b/docs/README.compiling-windows.txt index ce7c48571..09985ba50 100644 --- a/docs/README.compiling-windows.txt +++ b/docs/README.compiling-windows.txt @@ -28,6 +28,9 @@ To build the game, the following tools and libraries must be present: OR * mingw32 +* Experiemtnal Microsoft Visual C++ Express 2012 projects also exist in the vc2012 + folder + * MegaGlest Windows 32 bit dependencies for building with VC++: http://sourceforge.net/projects/megaglest/files/windows_deps.7z/download OR @@ -55,15 +58,11 @@ Option A) (recommended) Automated build on the command line: 2. cd mk\windoze -3. build-mg-2010.bat +3. build-mg-2010.bat (build-mg-2012.bat for vc 2012) -4. CopyWindowsRuntimeDlls_2010.bat +4. megaglest.exe --version -5. cd ..\..\data\glest_game - -6. megaglest.exe --version - -7. megaglest.exe +5. megaglest.exe Option B) Using VC++ IDE: diff --git a/docs/README.release-management.txt b/docs/README.release-management.txt index 5c051562e..9628b3a16 100644 --- a/docs/README.release-management.txt +++ b/docs/README.release-management.txt @@ -100,13 +100,11 @@ These will produce archives in the release folder name: megaglest-binary-* megaglest-standalone-data-* -To stamp a snapshot in svn for a release we use the following (substitute version #'s of course): -svn copy https://svn.code.sf.net/p/megaglest/code/trunk \ - https://svn.code.sf.net/p/megaglest/code/tags/release-3.9.0 -m \ - "Tagging the 3.9.0 release of MegaGlest" -svn copy https://svn.code.sf.net/p/megaglest/code/trunk-data-source \ - https://svn.code.sf.net/p/megaglest/code/tags/release-data-source-3.9.0 -m \ - "Tagging the 3.9.0 release of MegaGlest" +To stamp a snapshot in git for a release we use the following +(substitute version #'s of course and shasum to be the commit shasum): + +git tag 3.9.2 +git push --tags Linux Installer(s): =========================