summaryrefslogtreecommitdiffstats
path: root/INSTALL-MXE.md
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-11-23 00:50:20 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2013-11-23 00:51:06 +0100
commit405db2d70ca108a0422538a4f30072f1831f473b (patch)
treefc85ed7e091d861d6b841a3eb0fcf789495a72dc /INSTALL-MXE.md
parent29b1f9e4c69e8a587997960e42832555ecd21c9c (diff)
downloadcolobot-405db2d70ca108a0422538a4f30072f1831f473b.tar.gz
colobot-405db2d70ca108a0422538a4f30072f1831f473b.tar.bz2
colobot-405db2d70ca108a0422538a4f30072f1831f473b.zip
Updated INSTALL-MXE instructions
Diffstat (limited to 'INSTALL-MXE.md')
-rw-r--r--INSTALL-MXE.md21
1 files changed, 12 insertions, 9 deletions
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.