From 405db2d70ca108a0422538a4f30072f1831f473b Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sat, 23 Nov 2013 00:50:20 +0100
Subject: Updated INSTALL-MXE instructions

---
 INSTALL-MXE.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'INSTALL-MXE.md')

diff --git a/INSTALL-MXE.md b/INSTALL-MXE.md
index 47b6bcc..e8db7cd 100644
--- a/INSTALL-MXE.md
+++ b/INSTALL-MXE.md
@@ -29,7 +29,6 @@ To cross-compile Colobot using MXE:
     * check-requirements
     * expat
     * flac
-    * flac
     * freetype
     * gcc
     * gcc-gmp
@@ -55,13 +54,15 @@ To cross-compile Colobot using MXE:
     * xz
     * zlib
 
-4. Now `cd` to directory with colobot sources. To cross-compile a CMake project,
-   you have to specify a CMake toolchain file. MXE has such file in MXE's directory:
-   `usr/i686-pc-mingw32/share/cmake/mxe-conf.cmake`
-   Toolchain file is specified that way: `cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/mxe-conf.cmake .`
+4. Now `cd` to directory with colobot sources.
+   It is recommended that you create a separate directory for out-of-source build:
+   `mkdir build-mxe && cd build-mxe`
+
+   In order to cross-compile a CMake project, you have to specify a CMake toolchain file.
+   MXE has such file in MXE's directory: `usr/i686-pc-mingw32/share/cmake/mxe-conf.cmake`
+   So you should use the following cmake command: `cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/mxe-conf.cmake ..`
    CMake files in Colobot should detect that MXE is being used and they will
    modify flags, paths, etc. as required. You should not run into any problems.
-   *Note:* you may also want to use a separate out-of-source build directory for MXE.
 
 5. `make` should now compile the game with the resulting executable as `colobot.exe`.
    The exe is linked against all libraries *statically*, so there are no dependencies
@@ -70,6 +71,8 @@ To cross-compile Colobot using MXE:
 
 6. If you want to create a Colobot installer, you need to additionally build 'nsis'
    in MXE. Then you can create the NSIS installer that way:
-   `PATH=/path/to/mxe/binaries/:$PATH make package` This will create a versionned
-   colobot-$version.exe installer that will install Colobot in system directories,
-   add a shortcut in the start menu and setup an uninstaller.
+   `PATH=/path/to/mxe/binaries:$PATH make package`
+   where `/path/to/mxe/binaries` is path to cross-compiled MXE binaries available
+   in MXE's directory under `usr/i686-pc-mingw32/bin`.
+   This will create a versioned colobot-$version.exe installer that will install Colobot
+   in system directories, add a shortcut in the start menu and setup an uninstaller.
-- 
cgit v1.2.3-1-g7c22