Skip to content

Q
qgroundcontrol
Commit 07b5f77e authored by lm's avatar lm
Browse files
Options

Fixed Linux compile dir settings to include all support files in the correct directory

parent e99ffb3d
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
qgroundcontrol.pri
View file @ 07b5f77e
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment