From c3a2dfcf47d3a88723dfcaa81ce35363a0d41b20 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Fri, 6 Jan 2012 18:56:03 -0600
Subject: fix typo in path to CMingw-cross-env.cmake in instructions


diff --git a/tests/CMingw-cross-env.cmake b/tests/CMingw-cross-env.cmake
index 09ec1d1..7dd2a05 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.
-- 
cgit v0.10.1


From 7af27e183817181ec60b59b1d3270abd5f43f072 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Sat, 7 Jan 2012 07:15:49 -0600
Subject: add CMAKE_RC_COMPILER to fix bug report by Brad Pitcher


diff --git a/tests/CMingw-cross-env.cmake b/tests/CMingw-cross-env.cmake
index 7dd2a05..7063be4 100644
--- a/tests/CMingw-cross-env.cmake
+++ b/tests/CMingw-cross-env.cmake
@@ -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)
-- 
cgit v0.10.1