From 30052e1897c45cd441e8c50831c9075047ff4a3c Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Mon, 1 Apr 2019 15:17:08 +0200 Subject: [PATCH 1/7] Updated readme --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 458cb0db8..7ee149e75 100644 --- a/README.md +++ b/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 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)** From 570c1d6d44fefd231889acf6ddd905bd855494cc Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Mon, 1 Apr 2019 15:17:51 +0200 Subject: [PATCH 2/7] Updated readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7ee149e75..b36ae05db 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ source**](https://github.com/Glest/glest-source/blob/master/BUILD.md) ## Quick Build Guide for Linux -For Linux three options: +For Linux there are three options: 1. (Recommended) Using a Flatpak: https://github.com/glest/io.glest.Glest @@ -37,7 +37,7 @@ For Linux three options: git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh -Then run the following command to start the game: + Then run the following command to start the game: glest/mk/linux/build/glest From 50ea22d1a2baa200acd89ad8013c52fec2be6515 Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Mon, 1 Apr 2019 15:18:52 +0200 Subject: [PATCH 3/7] Updated readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b36ae05db..d00c313cb 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,11 @@ For Linux there are three options: 2. Using the build script: - git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh + git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh Then run the following command to start the game: - glest/mk/linux/build/glest + glest/mk/linux/build/glest 3. Building manually using CMake: https://github.com/glest/glest-source/blob/master/BUILD.md From 54161578f287ee9142a8859f6904fcf5a3c7e887 Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Mon, 1 Apr 2019 15:22:42 +0200 Subject: [PATCH 4/7] Updated build instructions --- BUILD.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/BUILD.md b/BUILD.md index a6f8b7eda..afaf8dbca 100644 --- a/BUILD.md +++ b/BUILD.md @@ -61,15 +61,21 @@ 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: - git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh +1. (Recommended) Using a Flatpak: https://github.com/glest/io.glest.Glest -Then run the following command to start the game: +2. Using the build script: - glest/mk/linux/build/glest + git clone https://github.com/Glest/glest-source.git glest; sudo glest/mk/linux/setup.sh -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. + Then run the following command to start the game: + + glest/mk/linux/build/glest + + 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: @@ -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) From 58d6846b111368ecaf551a3e6856a094fb74a102 Mon Sep 17 00:00:00 2001 From: Jammyjamjamman Date: Thu, 4 Apr 2019 21:27:30 +0100 Subject: [PATCH 5/7] Make paths slashed again! --- source/game/global/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/game/global/config.cpp b/source/game/global/config.cpp index eed48e53c..705a88ebe 100644 --- a/source/game/global/config.cpp +++ b/source/game/global/config.cpp @@ -219,7 +219,7 @@ namespace Game { if (foundPath == false) { foundPath = tryCustomPath(cfgType, fileName, - formatPath(TOSTRING(DATADIR))); + formatPath(endPathWithSlash((DATADIR)))); } #endif From 08cc68400e9423b4013e88c4657d66c8aefb945c Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Thu, 4 Apr 2019 22:40:06 +0200 Subject: [PATCH 6/7] Fixedd last commit --- source/game/global/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/game/global/config.cpp b/source/game/global/config.cpp index 705a88ebe..d11524a88 100644 --- a/source/game/global/config.cpp +++ b/source/game/global/config.cpp @@ -219,7 +219,7 @@ namespace Game { if (foundPath == false) { foundPath = tryCustomPath(cfgType, fileName, - formatPath(endPathWithSlash((DATADIR)))); + formatPath(endPathWithSlash(TOSTRING(DATADIR)))); } #endif From 942617041e7a2d4cf990001a14c9535837af984c Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Thu, 4 Apr 2019 22:42:44 +0200 Subject: [PATCH 7/7] i need a drink,,, --- source/game/global/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/game/global/config.cpp b/source/game/global/config.cpp index d11524a88..eed48e53c 100644 --- a/source/game/global/config.cpp +++ b/source/game/global/config.cpp @@ -219,7 +219,7 @@ namespace Game { if (foundPath == false) { foundPath = tryCustomPath(cfgType, fileName, - formatPath(endPathWithSlash(TOSTRING(DATADIR)))); + formatPath(TOSTRING(DATADIR))); } #endif