Merge remote-tracking branch 'upstream/v10release' into v10release

08a94ecc · Lionel Heng · 25b35d89 · 6d2aedee · 08a94ecc
Commit 08a94ecc authored Jan 30, 2012 by Lionel Heng
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 5 deletions

qgroundcontrol.pri qgroundcontrol.pri +22 -5

No files found.
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -358,11 +358,28 @@ linux-g++-64 {
    }
    # Validated copy commands
-    QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR
+    debug {
-    QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR
+        !exists($$TARGETDIR/debug){
-    QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR
+             QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/debug
-    QMAKE_POST_LINK += && mkdir -p $$TARGETDIRimages
+        }
-    QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$TARGETDIR/images/Vera.ttf
+        DESTDIR = $$TARGETDIR/debug
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/debug
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR/debug
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/debug
+        QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/debug/images
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$TARGETDIR/debug/images/Vera.ttf
+    }
+    release {
+        !exists($$TARGETDIR/release){
+             QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/release
+        }
+        DESTDIR = $$TARGETDIR/release
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/release
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR/release
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release
+        QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/release/images
+        QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$TARGETDIR/release/images/Vera.ttf
+    }
    # osg/osgEarth dynamic casts might fail without this compiler option.
    # see http://osgearth.org/wiki/FAQ for details.