From 28d1a1300c6be7fc8614ed827eb56cd97cf84e76 Mon Sep 17 00:00:00 2001 From: DRC Date: Thu, 14 Apr 2016 14:12:46 -0500 Subject: [PATCH] BUILDING.md: Fix confusing Windows build reqs Indent "... OR ..." to make it clear that the choice is between Visual C++ and MinGW, not Visual C++ and MinGW + NASM. Move NASM to the top of the list to make that even more clear. Make it clear that nasm.exe should be in the PATH. Addresses concerns raised in #70 --- BUILDING.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index b4da23f2..f127918e 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -460,6 +460,10 @@ Build Requirements - [CMake](http://www.cmake.org) v2.8.8 or later +- [NASM](http://www.nasm.us/) 0.98 or later (NASM 2.05 or later is required for + a 64-bit build) + * nasm.exe should be in your `PATH`. + - Microsoft Visual C++ 2005 or later If you don't already have Visual C++, then the easiest way to get it is by @@ -480,7 +484,7 @@ Build Requirements SDK. You can pass optional arguments to `SetEnv.cmd` to specify a 32-bit or 64-bit build environment. -... OR ... + ... OR ... - MinGW @@ -490,9 +494,6 @@ Build Requirements launch a command prompt with the appropriate compiler paths automatically set. -- [NASM](http://www.nasm.us/) 0.98 or later (NASM 2.05 or later is required for - a 64-bit build) - - If building the TurboJPEG Java wrapper, JDK 1.5 or later is required. This can be downloaded from .