Merge branch 'develop' into develop

This commit is contained in:
MathuSum Mut
2018-04-29 02:26:31 +02:00
committed by GitHub

View File

@@ -6,15 +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. 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`. 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). 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`. 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:
4. The built binaries will be found in the corresponding Visual Studio version and platform selected in `/mk/windows`. `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.
5. Run and enjoy! :) 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:* *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: To be able to run ZetaGlest from within Visual Studio using the debugger, you need to:
1. Set `glest_game` as the startup project. 1. Set `glest_game` as the startup project.