From 825eb8529557d201ba7ff49c9665aaa2e19ae29f Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Thu, 12 Apr 2018 15:17:46 +0200 Subject: [PATCH 1/3] Updated Windows Readme --- mk/windows/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mk/windows/README.md b/mk/windows/README.md index bc2083e48..fc3e7b1cf 100644 --- a/mk/windows/README.md +++ b/mk/windows/README.md @@ -6,9 +6,10 @@ To build ZetaGlest for the first time: 1. Download Git for Windows (or make sure it is installed), and make sure that `git` is in the `PATH` environment variable. To check, open `cmd` and write `git`. If you get a `not recognized` error, then continue with step 1, otherwise skip to step 2. Usually `git.exe` is located in `C:\Program Files\Git\bin` after installation. To add it to `PATH`, right-click on `This PC` -> `Properties` -> `Advanced system settings` -> `Advanced` tab -> `Environment Variables`, and under `System variables` double-click on `PATH`, and add the path to `git` as a listing and click `OK`. 2. Go to the target directory and clone this repository by running the following command in the command prompt: `git clone https://github.com/ZetaGlest/zetaglest-source.git` (or if you have your own fork, replace the first "ZetaGlest" in the URL with your GitHub username). -3. After cloning, run `setup.bat` in `/mk/windows`. -4. The built binaries will be found in the corresponding Visual Studio version and platform selected in `/mk/windows`. -5. Run and enjoy! :) +3. Make sure Visual Studio 2015 or 2017 is installed, and that the Windows 8.1 SDK is included in the installation. +4. Run `setup.bat` in `/mk/windows`. +5. The built binaries will be found in the corresponding Visual Studio version and platform selected in `/mk/windows`. +6. Run and enjoy! :) *Side-note for developers who want to debug:* From f5e2d48d0778f706ed1316ffd3b7d796a8cdd1b0 Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Thu, 12 Apr 2018 15:19:18 +0200 Subject: [PATCH 2/3] Updated Windows Readme --- mk/windows/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mk/windows/README.md b/mk/windows/README.md index fc3e7b1cf..9afb648b9 100644 --- a/mk/windows/README.md +++ b/mk/windows/README.md @@ -6,16 +6,14 @@ To build ZetaGlest for the first time: 1. Download Git for Windows (or make sure it is installed), and make sure that `git` is in the `PATH` environment variable. To check, open `cmd` and write `git`. If you get a `not recognized` error, then continue with step 1, otherwise skip to step 2. Usually `git.exe` is located in `C:\Program Files\Git\bin` after installation. To add it to `PATH`, right-click on `This PC` -> `Properties` -> `Advanced system settings` -> `Advanced` tab -> `Environment Variables`, and under `System variables` double-click on `PATH`, and add the path to `git` as a listing and click `OK`. 2. Go to the target directory and clone this repository by running the following command in the command prompt: `git clone https://github.com/ZetaGlest/zetaglest-source.git` (or if you have your own fork, replace the first "ZetaGlest" in the URL with your GitHub username). -3. Make sure Visual Studio 2015 or 2017 is installed, and that the Windows 8.1 SDK is included in the installation. +3. Make sure Visual Studio 2015 or 2017 is installed, and that the Windows 8.1 SDK is included in the installation. If Visual Studio is installed in a different directory than the default, run the following command before running the script: +`SET ProgramFiles(x86)=dir` where `dir` should be replaced with the directory containing the Visual Studio installation, usually `Program Files (x86)`. If Windows is 32-bit, omit the `(x86)` part. 4. Run `setup.bat` in `/mk/windows`. 5. The built binaries will be found in the corresponding Visual Studio version and platform selected in `/mk/windows`. 6. Run and enjoy! :) *Side-note for developers who want to debug:* -If Visual Studio is installed in a different directory than the setup default, run the following command before running the script: -`SET ProgramFiles(x86)=dir` where `dir` should be replaced with the directory containing the Visual Studio installation, usually `Program Files (x86)`. If Windows is 32-bit, omit the `(x86)` part. - To be able to run ZetaGlest from within Visual Studio using the debugger, you need to: 1. Set `glest_game` as the startup project. From 2c7cde21f685451fbaf6f61c527824ce05358512 Mon Sep 17 00:00:00 2001 From: MathuSum Mut Date: Sat, 21 Apr 2018 15:08:50 +0200 Subject: [PATCH 3/3] Fixed setup.bat --- mk/windows/setup.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/windows/setup.bat b/mk/windows/setup.bat index 0af4cbc22..b748286de 100644 --- a/mk/windows/setup.bat +++ b/mk/windows/setup.bat @@ -1,3 +1,3 @@ @echo off -.\clone-deps.bat -.\build-zg.bat \ No newline at end of file +call .\clone-deps.bat +call .\build-zg.bat