Merge branch 'master' of https://github.com/Glest/glest-source

BUILD.md

@@ -61,7 +61,11 @@ listed in the `Windows` directory for further information.
 
 ### Linux
 
-To get the game up and running quickly, use the following command:
+For Linux there are three options: 
+
+1. (Recommended) Using a Flatpak: https://github.com/glest/io.glest.Glest
+
+2. Using the build script:
 
        git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh
 
@@ -71,6 +75,8 @@ Then run the following command to start the game:
 
    To update and rebuild the game, simply rerun `sudo glest/mk/linux/setup.sh`, as it performs a `git pull` as part of the process.
 
+3. Using building manually using CMake (see below)
+
 #### For a more thorough approach:
 
 On Debian, Ubuntu, Fedora, Opensuse and even more Linux distributions,
@@ -152,7 +158,7 @@ Now that the build configuration has been set, run make, replacing `X` with the
 
     make -jX
 
-On Linux, `X` can be substituted with `$(grep -c ^processor /proc/cpuinfo)`, to automatically get the number of cpu threads:
+On Linux, `X` can be substituted with `$(grep -c ^processor /proc/cpuinfo)`, to automatically get the number of CPU threads:
 
     make -j$(grep -c ^processor /proc/cpuinfo)
 

README.md

@@ -29,7 +29,11 @@ source**](https://github.com/Glest/glest-source/blob/master/BUILD.md)
 
 ## Quick Build Guide for Linux
 
-For Linux, run the following command:
+For Linux there are three options: 
+
+1. (Recommended) Using a Flatpak: https://github.com/glest/io.glest.Glest
+
+2. Using the build script:
 
        git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh
 
@@ -37,6 +41,8 @@ Then run the following command to start the game:
 
        glest/mk/linux/build/glest
 
+3. Building manually using CMake: https://github.com/glest/glest-source/blob/master/BUILD.md
+
 ## Links
 
 * **[Screenshots](https://github.com/Glest/screenshots)**