zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

QGC4.4
lm 15 years ago
parent
e99ffb3d59
commit
07b5f77e83
1 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      qgroundcontrol.pri

26
qgroundcontrol.pri
Unescape View File

@ -147,12 +147,12 @@ macx { @@ -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++ { @@ -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++ { @@ -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 { @@ -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

Write Preview
Loading…
Cancel
Save