From e0e1709c275fc294ecd4fa8f6673ba38a2a8a086 Mon Sep 17 00:00:00 2001 From: Daniel Gurney Date: Fri, 18 Aug 2017 11:06:53 +0300 Subject: [PATCH] Revise the instructions yet again --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f6ba5eacf..b66e066b0 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,17 @@ Keep in touch with the 86Box community: --- # Compilation In order to compile 86Box from this repository, please follow this step-by-step guide: -1) Download the development environment from http://tinyurl.com/pcemude. 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. +1) Download the development environment from http://tinyurl.com/pcemude. 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) Once the environment is fully updated, **cd** into your cloned **86box\src** directory. 5) Run **make -j*N* -fmakefile.mingw** to start the actual compilation process. Substitute *N* with the number of threads you want to use for the compilation process. The optimal number depends entirely on your processor, and it is up to you to determine the optimal number. A good starting point is the total number of threads (AKA Logical Processors) you have available. 6) If the compilation succeeded (which it almost always should), you will find **86Box.exe** in the src directory. +<<<<<<< HEAD 7) In order to test your fresh build, replace the **86Box.exe** in your current 86Box enviroment with your freshly built one. If you do not have a pre-existing 86Box environment, download the latest successful build from http://ci.86box.net, and the ROM set from http://tinyurl.com/roms2017. +======= +7) In order to test your fresh build, replace the **86Box.exe** in your current 86Box enviroment with your freshly built one. If you do not have a pre-existing 86Box environment, download the latest successful build from http://ci.86box.net, and the ROM set from http://tinyurl.com/roms201708. +>>>>>>> 2587453... Revise the instructions yet again 8) Enjoy using and testing the emulator! :) If you encounter issues at any step or have additional questions, please join the IRC channel and wait patiently for someone to help you.