From 480f7b5903d0a2e8580f127235545c4cb971d791 Mon Sep 17 00:00:00 2001 From: Daniel Gurney Date: Wed, 8 Jan 2020 20:03:50 +0200 Subject: [PATCH] Update readme with new build instructions --- README.md | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 114a9073f..c825e0c57 100644 --- a/README.md +++ b/README.md @@ -30,24 +30,11 @@ Building -------- In order to compile 86Box from this repository, please follow this step-by-step guide: -1. Download the development environment from http://tinyurl.com/de86box. - Afterwards, extract it to your desired location. Of course, also clone - the repository in your desired location. Downloading ZIPs is not recommended, - as it makes it more inconvenient to keep the code up-to-date. To avoid - issues, make sure neither path has spaces in it. -2. In the extracted environment folder, you will find a script called - `mingw32_shell.bat`. Launch it. There are other shell launching scripts - in there, but you should not use them. -3. Once launched, run `pacman -Syuu` in order to update the environment. - Depending on the state of the downloaded DE, you may need to run it twice - (once initially, and then again after re-entering the environment). Make sure - to keep the enviroment up-to-date by re-running the command periodically. -4. Run the following commands to install the missing packages: - * `pacman -S mingw-w64-i686-libpng` - * `pacman -S mingw-w64-i686-freetype` - * `pacman -S mingw-w64-i686-ghostscript` - * `pacman -S mingw-w64-i686-SDL2` -5. Once the environment is fully updated, `cd` into your cloned `86box\src` +1. Install the [MSYS2](https://www.msys2.org/) environment. The rest of the guide will refer to the directory that you install it to (C:\msys32 or C:\msys64 by default) as the MSYS2 root. +2. Launch your MSYS2 environment using the `MSYS2 MinGW 32-bit` shortcut. +3. Once launched, run `pacman -Syu` in order to update the environment. You may need to do this twice, just follow the on-screen instructions. Make sure you re-run `pacman -Syu` periodically to keep the environment up-to-date. +4. Run the following command to install all of the dependencies: `pacman -S gdb make git mingw-w64-i686-toolchain mingw-w64-i686-openal mingw-w64-i686-freetype mingw-w64-i686-SDL2 mingw-w64-i686-zlib mingw-w64-i686-libpng mingw-w64-i686-ghostscript`. Additionally, you will need to download the developer's pack of WinPcap [from here](https://www.winpcap.org/devel.htm), and extract it into `\mingw32\`. +5. Once the environment is fully updated and all dependencies are installed, `cd` into your cloned `86box\src` directory. 6. Run `make -jN -f win/makefile.mingw` to start the actual compilation process. Substitute `N` with the number of threads you want to use for the compilation