summaryrefslogtreecommitdiff
path: root/doc/testing.txt
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2012-01-03 02:44:50 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2012-01-03 02:44:50 (GMT)
commitb9c027a69987f29019f947029050defa2898575b (patch)
tree4ea5e5cc9e75b865e819de6ab3b7758f09eb1ce5 /doc/testing.txt
parent0acf0fee5b60c5fd5ae28767849270b8c2e729c0 (diff)
use pkg-config to find QT libraries in mingw-cross-env, not FindQt4.cmake
Diffstat (limited to 'doc/testing.txt')
-rw-r--r--doc/testing.txt18
1 files changed, 2 insertions, 16 deletions
diff --git a/doc/testing.txt b/doc/testing.txt
index 331b485..f690939 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -22,23 +22,9 @@ Then, from the QT command prompt:
> cmake .
> nmake -f Makefile
-Cross compiling Linux->Windows:
+Cross compiling Linux->Win32:
-Additional prerequisities: wine, mingw-cross-env
-
-Note: CTest harness will only run under Wine under *nix, not under Win32.
-
-Follow the instructions for installing the mingw-env cross build system at
-http://en.wikibooks.org/wiki/OpenSCAD_User_Manual , especially the part
-about including the cross-compiler in your PATH. If you do cross-builds,
-it's recommended to use out-of-source builds (mkdir buildx; cd buildx; cmake ..)
-in order to keep your native *nix build separate from your cross-build.
-
-$ cd tests
-$ mkdir build-mingw32
-$ cd build-mingw32
-$ cmake .. -DMINGW_CROSS_ENV_DIR=<mingw-env-dir> -DCMAKE_TOOLCHAIN_FILE=CMingw-env-cross.cmake
-$ make
+Please see openscad/tests/CMingw-cross-env.cmake for instructions.
B) Running tests
contact: Jan Huwald // Impressum