From 9666feaab11c22e14d9ae21b60df2ffa609dbee5 Mon Sep 17 00:00:00 2001 From: pixhawk Date: Thu, 22 Dec 2011 14:25:15 +0100 Subject: [PATCH] Fixes to Linux build --- qgroundcontrol.pri | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 4da3d4622..c3270d3d3 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -201,12 +201,12 @@ message("Compiling for linux 32") } # Validated copy commands - QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$DESTDIR - QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$DESTDIR + QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR + QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR - 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 + QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR + QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/images + QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$TARGETDIR/images/Vera.ttf # osg/osgEarth dynamic casts might fail without this compiler option. # see http://osgearth.org/wiki/FAQ for details. @@ -283,11 +283,11 @@ linux-g++-64 { } # Validated copy commands - QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$DESTDIR - QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$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 + QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR + QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR + QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR + QMAKE_POST_LINK += && mkdir -p $$TARGETDIRimages + QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$TARGETDIR/images/Vera.ttf # osg/osgEarth dynamic casts might fail without this compiler option. # see http://osgearth.org/wiki/FAQ for details. -- 2.22.0