Update Compilation.md.

Mention MSYS2, XP removal and a few tweaks.

1 files changed, 31 insertions, 8 deletions

diff --git a/docs/Compilation.md b/docs/Compilation.md
index ea15eb256..e70afcee2 100644
--- a/docs/Compilation.md
+++ b/docs/Compilation.md
@@ -1,6 +1,10 @@
 # Compilation instructions

 

-For up to date instructions on how to compile mpc-hc visit the wiki page: <https://trac.mpc-hc.org/wiki/How_to_compile_the_MPC>

+## General Tools

+

+First of all, install **Git for Windows** from <https://git-for-windows.github.io/>.

+Choose `Use Git from the Windows command prompt`. This isn't mandatory, so if you choose

+`Use Git from Git Bash only` make sure you set the `MPCHC_GIT` variable in `build.user.bat`.

 

 

 ## Part A: Preparing the Visual Studio environment

@@ -8,23 +12,42 @@ For up to date instructions on how to compile mpc-hc visit the wiki page: <https
 ### Visual Studio 2017 or 2015

 

 1. Install Visual C++, part of Visual Studio (any edition will work fine).

-   Make sure to select **Windows XP** and **ATL/MFC** support during installation.

+   Make sure to select **Windows 10 SDK (10.0.10586.0)** and **MFC and ATL support** during installation.

 2. Make sure you have installed all available updates from Microsoft Update

 3. Install the DirectX SDK (June 2010) → <https://go.microsoft.com/fwlink/?LinkID=71193>

 

 

 ## Part B: Preparing the GCC environment

 

-1. Download and extract **MSYS_MinGW-w64_GCC_710_x86-x64.7z** to **C:\MSYS** → <http://xhmikosr.1f0.de/tools/msys/MSYS_MinGW-w64_GCC_710_x86-x64.7z>.

-   For the components and their version see <http://xhmikosr.1f0.de/tools/msys/MSYS_MinGW-w64_GCC_710_x86-x64_components.txt>

-2. Create a file named **build.user.bat** in **C:\mpc-hc** containing the following entries, adapted for your system:

+1. Download MSYS2 from <http://www.msys2.org/>.

+   If you are on a 64-bit Operating System, which you should be, get the 64-bit version.

+2. Install it on **`C:\MSYS\`**. You can always install it somewhere else, but these instructions

+   assume the aforementioned place.

+3. Run `msys2_shell.bat` (if you didn't use the installer you must restart MSYS2 after first run).

+4. Install the needed software by running these commands:

+   ```text

+   pacman -Syu

+   pacman -Su

+   pacman -S make pkg-config

+   ```

+   Note that this is the bare minimum, you can install more packages that can be useful to you.

+5. Download YASM and save it as **yasm.exe** in **`C:\MSYS\usr\bin`**:

+   * 32-bit: <http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe>

+   * 64-bit: <http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe> (Recommended)

+6. Download and extract MinGW to **`C:\MSYS\mingw\`** from <http://files.1f0.de/mingw/>

+   (you might use the one that ships with MSYS2, but we recommend this one)

+7. Create a file named **build.user.bat** in **`C:\mpc-hc\`** containing the following entries,

+   adapted for your system:

 

     ```bat

     @ECHO OFF

+    SET "MSYSTEM=MINGW32"

     SET "MPCHC_MSYS=C:\MSYS"

     SET "MPCHC_MINGW32=%MPCHC_MSYS%\mingw"

     SET "MPCHC_MINGW64=%MPCHC_MINGW32%"

-    REM Git is optional to set if you chose to add it in PATH when installing it

+    REM You can set `MSYS2_PATH_TYPE` here or in environment variables so that Git is properly added to your `PATH`

+    REM SET "MSYS2_PATH_TYPE=inherit"

+    REM `MPCHC_GIT` is optional to set if you chose to add it in `PATH` when installing it and have set `MSYS2_PATH_TYPE`

     SET "MPCHC_GIT=C:\Program Files\Git"

     REM Optional, if you plan to modify the translations, install Python 2.7 or set the variable to its path

     SET "MPCHC_PYTHON=C:\Python27"

@@ -33,7 +56,7 @@ For up to date instructions on how to compile mpc-hc visit the wiki page: <https
 ### NOTES

 

 * For Visual Studio 2017, we will try to detect the VS installation path automatically.

-  If that fails you need to specify the instalation path yourself. For example:

+  If that fails you need to specify the installation path yourself. For example:

   ```bat

   SET "MPCHC_VS_PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\"

   ```

@@ -96,4 +119,4 @@ read the first comments in the script and compile it.
 ### NOTES

 

 * **build.bat** can build the installer by using the **installer** or the **packages** switch.

-* Use Inno Setup's built-in IDE if you want to edit the iss file.

+* Use Inno Setup's built-in IDE if you want to edit the iss file and don't change its encoding since it can break easily.