diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-21 23:23:24 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-21 23:23:24 +0100 |
| commit | 458401d64fbe500295cc8e903702638fde0ab934 (patch) | |
| tree | 3d1c606f118dba2b4f38fa80614bf30fdc12277c /packaging | |
| parent | e6cd1f9cb82811d05e08aef0493eeba9cc41a95d (diff) | |
| parent | d4bb2d1d0e82ca9d046f9b2346a7893ca11e8d9c (diff) | |
| download | mana-458401d64fbe500295cc8e903702638fde0ab934.tar.gz mana-458401d64fbe500295cc8e903702638fde0ab934.tar.bz2 mana-458401d64fbe500295cc8e903702638fde0ab934.tar.xz mana-458401d64fbe500295cc8e903702638fde0ab934.zip | |
Merge branch '0.5'
Translation file updates ignored.
Conflicts:
src/client.cpp
src/commandhandler.cpp
src/gui/popupmenu.cpp
src/localplayer.cpp
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows/package-helpers | 10 | ||||
| -rw-r--r-- | packaging/windows/toolchain.cmake.example | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/packaging/windows/package-helpers b/packaging/windows/package-helpers index de953149..a451f573 100644 --- a/packaging/windows/package-helpers +++ b/packaging/windows/package-helpers @@ -22,6 +22,14 @@ # - MANALIBS -- the directory containing the dlls copied into the # windows installer. Default is using the last directory in the # toolchains SET(CMAKE_FIND_ROOT_PATH +# +# Also, please note that the untgz nsis Plugins is needed to create +# an installer. +# The default nsis Plugins folder in most Linux distros is: +# in /usr/share/nsis/Plugins/ +# +# The default folder to use the toolchain in most Linux distros is: +# /usr/i586msvc-mingw32/ # MANA_BASE should point to the top directory of the source tree if [ -z "$MANA_BASE" ]; then @@ -110,4 +118,4 @@ mana-build-win32-installer(){ mana-nuke-cmake-stuff(){ find $MANA_BASE -name CMakeFiles -type d -exec rm -Rf '{}' \; 2>/dev/null find $MANA_BASE -name CMakeCache.txt -type f -exec rm '{}' \; 2>/dev/null -}
\ No newline at end of file +} diff --git a/packaging/windows/toolchain.cmake.example b/packaging/windows/toolchain.cmake.example index 0e99bd37..707246d0 100644 --- a/packaging/windows/toolchain.cmake.example +++ b/packaging/windows/toolchain.cmake.example @@ -9,9 +9,14 @@ ENDIF() SET(CMAKE_C_COMPILER ${TOOLCHAIN}gcc) SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++) +# which rc compiler to use +SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres) + # here is the target environment located # the directories specified here should contain two directories, # 'include' for the headers, 'lib' for dlls and .a files +# For instance, the mingw32 headers can be installed at: +# /usr/i586-mingw32msvc/ SET(CMAKE_FIND_ROOT_PATH /build/mingw32 /build/tmw-libs ) # adjust the default behaviour of the FIND_XXX() commands: |