Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
07b5f77e
Commit
07b5f77e
authored
Dec 10, 2010
by
lm
Browse files
Fixed Linux compile dir settings to include all support files in the correct directory
parent
e99ffb3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
qgroundcontrol.pri
View file @
07b5f77e
...
...
@@ -147,12 +147,12 @@ macx {
linux-g++ {
debug {
#
DESTDIR = $$
BUILD
DIR/debug
DESTDIR = $$
TARGET
DIR/debug
CONFIG += debug
}
release {
#
DESTDIR = $$
BUILD
DIR/release
DESTDIR = $$
TARGET
DIR/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 = $$
BUILD
DIR/debug
DESTDIR = $$
TARGET
DIR/debug
CONFIG += debug
}
release {
#
DESTDIR = $$
BUILD
DIR/release
DESTDIR = $$
TARGET
DIR/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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment