From 07b5f77e83eb70c1719cf70439ad983015dff534 Mon Sep 17 00:00:00 2001 From: lm Date: Fri, 10 Dec 2010 18:06:56 +0100 Subject: [PATCH] Fixed Linux compile dir settings to include all support files in the correct directory --- qgroundcontrol.pri | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 3c6eecf..49cdbf3 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -147,12 +147,12 @@ macx { linux-g++ { debug { - #DESTDIR = $$BUILDDIR/debug + DESTDIR = $$TARGETDIR/debug CONFIG += debug } release { - #DESTDIR = $$BUILDDIR/release + DESTDIR = $$TARGETDIR/release } QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/. @@ -202,15 +202,10 @@ linux-g++ { DEFINES += QGC_LIBFREENECT_ENABLED } - debug { - QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug - QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/debug - } - - release { - QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release - QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release - } + QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$DESTDIR + QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$DESTDIR + QMAKE_POST_LINK += && mkdir -p $$DESTDIR/images + QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf # osg/osgEarth dynamic casts might fail without this compiler option. # see http://osgearth.org/wiki/FAQ for details. @@ -220,12 +215,12 @@ linux-g++ { linux-g++-64 { debug { - #DESTDIR = $$BUILDDIR/debug + DESTDIR = $$TARGETDIR/debug CONFIG += debug } release { - #DESTDIR = $$BUILDDIR/release + DESTDIR = $$TARGETDIR/release } QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/. @@ -276,6 +271,11 @@ linux-g++-64 { DEFINES += QGC_LIBFREENECT_ENABLED } + QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$DESTDIR + QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$DESTDIR + QMAKE_POST_LINK += && mkdir -p $$DESTDIR/images + QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf + # osg/osgEarth dynamic casts might fail without this compiler option. # see http://osgearth.org/wiki/FAQ for details. QMAKE_CXXFLAGS += -Wl,-E