summaryrefslogtreecommitdiff
path: root/mingw-cross-env.pri
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2012-07-15 16:47:18 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2012-07-15 16:47:18 (GMT)
commitcd81cecc3a37de7f3585f5bfaa528f63fcdf5dd9 (patch)
tree71c6836cbe6c5b8a2763ddb926f51ee147265a3d /mingw-cross-env.pri
parenteb58394e748b3bcca05d85bdacf641f6581b240b (diff)
put .o files of cross into separate directory. handle git issue.
Diffstat (limited to 'mingw-cross-env.pri')
-rw-r--r--mingw-cross-env.pri27
1 files changed, 16 insertions, 11 deletions
diff --git a/mingw-cross-env.pri b/mingw-cross-env.pri
index a1f3cb0..bc6f33a 100644
--- a/mingw-cross-env.pri
+++ b/mingw-cross-env.pri
@@ -8,19 +8,24 @@ CONFIG(mingw-cross-env) {
LIBS += mingw-cross-env/lib/libglu32.a
LIBS += mingw-cross-env/lib/libopencsg.a
LIBS += mingw-cross-env/lib/libmpfr.a
+ LIBS += mingw-cross-env/lib/libgmp.a
LIBS += mingw-cross-env/lib/libCGAL.a
QMAKE_CXXFLAGS += -fpermissive
- Release:DESTDIR = release
- Release:OBJECTS_DIR = release/objects
- Release:MOC_DIR = release/moc
- Release:RCC_DIR = release/rcc
- Release:UI_DIR = release/ui
-
- Debug:DESTDIR = debug
- Debug:OBJECTS_DIR = debug/objects
- Debug:MOC_DIR = debug/moc
- Debug:RCC_DIR = debug/rcc
- Debug:UI_DIR = debug/ui
+
+ # Use different location for the cross-compiled binaries + .o files
+ # This allows compiling unix build + mingw build in same tree
+
+ DESTDIR=.
+
+ Release:DESTDIR = release_mingw32
+ Debug:DESTDIR = debug_mingw32
+
+ OBJECTS_DIR = $$DESTDIR/objects
+ MOC_DIR = $$DESTDIR/moc
+ RCC_DIR = $$DESTDIR/rcc
+ UI_DIR = $$DESTDIR/ui
+
}
+
contact: Jan Huwald // Impressum