diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
| commit | 23f6b0623c86eba96dfb1296b862522cf02b0734 (patch) | |
| tree | 998500ef16763f6f08f9f7cb8917c98b1643af68 /tests/CMingw-cross-env.cmake | |
| parent | 52dfffd97ba49b603b4814d843cd9be08d040364 (diff) | |
| parent | 5044ea928d72da800d11b2b80f6148265c13d10f (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'tests/CMingw-cross-env.cmake')
| -rw-r--r-- | tests/CMingw-cross-env.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/CMingw-cross-env.cmake b/tests/CMingw-cross-env.cmake index 09ec1d1..7063be4 100644 --- a/tests/CMingw-cross-env.cmake +++ b/tests/CMingw-cross-env.cmake @@ -10,7 +10,7 @@ # http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Cross-compiling_for_Windows_on_Linux_or_Mac_OS_X # - cross-compile openscad.exe, to verify your installation works properly. # - cd openscad/tests && mkdir build-mingw32 && cd build-mingw32 -# - cmake .. -DCMAKE_TOOLCHAIN_FILE=CMingw-cross-env.cmake \ +# - cmake .. -DCMAKE_TOOLCHAIN_FILE=../CMingw-cross-env.cmake \ # -DMINGW_CROSS_ENV_DIR=<where mingw-cross-env is installed> # - make should proceed as normal. # - now run 'ctest' on your *nix machine. @@ -78,6 +78,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_C_COMPILER ${MINGW_CROSS_ENV_DIR}/usr/bin/i686-pc-mingw32-gcc) set(CMAKE_CXX_COMPILER ${MINGW_CROSS_ENV_DIR}/usr/bin/i686-pc-mingw32-g++) +set(CMAKE_RC_COMPILER ${MINGW_CROSS_ENV_DIR}/usr/bin/i686-pc-mingw32-windres) set(QT_QMAKE_EXECUTABLE ${MINGW_CROSS_ENV_DIR}/usr/bin/i686-pc-mingw32-qmake) set(PKG_CONFIG_EXECUTABLE ${MINGW_CROSS_ENV_DIR}/usr/bin/i686-pc-mingw32-pkg-config) set(CMAKE_BUILD_TYPE RelWithDebInfo) |