Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
546b4100
Commit
546b4100
authored
Dec 20, 2010
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Windows build options to support both CP and COPY/XCOPY
parent
315dbba9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
8 deletions
+36
-8
qgroundcontrol.pri
qgroundcontrol.pri
+36
-8
No files found.
qgroundcontrol.pri
View file @
546b4100
...
@@ -43,7 +43,7 @@ QMAKE_POST_LINK += echo "Copying files"
...
@@ -43,7 +43,7 @@ QMAKE_POST_LINK += echo "Copying files"
# MAC OS X
# MAC OS X
macx {
macx {
COMPILER_VERSION = system(gcc -v)
COMPILER_VERSION =
$$
system(gcc -v)
message(Using compiler $$COMPILER_VERSION)
message(Using compiler $$COMPILER_VERSION)
HARDWARE_PLATFORM = $$system(uname -a)
HARDWARE_PLATFORM = $$system(uname -a)
...
@@ -334,16 +334,16 @@ exists($$BASEDIR/lib/osgEarth123) {
...
@@ -334,16 +334,16 @@ exists($$BASEDIR/lib/osgEarth123) {
debug {
debug {
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\"
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\"
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
audio\" \"$$TARGETDIR_WIN\debug
\audio\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
\audio\" \"$$TARGETDIR_WIN\\debug\
\audio\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
models\" \"$$TARGETDIR_WIN\debug
\models\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
\models\" \"$$TARGETDIR_WIN\\debug\
\models\" /S /E /Y
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR
/images/earth.html $$TARGETDIR_WIN
\debug\"
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR
\\images\\earth.html $$TARGETDIR_WIN\
\debug\"
}
}
release {
release {
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\
lib\sdl\win32\SDL.dll\" \"$$TARGETDIR_WIN\release
\SDL.dll\"
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\
\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\release\
\SDL.dll\"
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
audio\" \"$$TARGETDIR_WIN\release
\audio\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
\audio\" \"$$TARGETDIR_WIN\\release\
\audio\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
models\" \"$$TARGETDIR_WIN\release
\models\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\
\models\" \"$$TARGETDIR_WIN\\release\
\models\" /S /E /Y
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR
/images/earth.html $$TARGETDIR_WIN
\release\"
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR
\\images\\earth.html $$TARGETDIR_WIN\
\release\"
}
}
}
}
...
@@ -363,6 +363,8 @@ win32-g++ {
...
@@ -363,6 +363,8 @@ win32-g++ {
LIBS += -L$$BASEDIR/lib/sdl/win32 \
LIBS += -L$$BASEDIR/lib/sdl/win32 \
-lmingw32 -lSDLmain -lSDL -mwindows
-lmingw32 -lSDLmain -lSDL -mwindows
CONFIG += windows
debug {
debug {
...
@@ -377,6 +379,9 @@ win32-g++ {
...
@@ -377,6 +379,9 @@ win32-g++ {
# Copy dependencies
# Copy dependencies
system(cp): {
# CP command is available, use it instead of copy / xcopy
message("Using cp to copy image and audio files to executable")
debug {
debug {
QMAKE_POST_LINK += && cp $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/SDL.dll
QMAKE_POST_LINK += && cp $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/SDL.dll
QMAKE_POST_LINK += && cp -r $$BASEDIR/audio $$TARGETDIR/debug/audio
QMAKE_POST_LINK += && cp -r $$BASEDIR/audio $$TARGETDIR/debug/audio
...
@@ -389,6 +394,29 @@ win32-g++ {
...
@@ -389,6 +394,29 @@ win32-g++ {
QMAKE_POST_LINK += && cp -r $$BASEDIR/models $$TARGETDIR/release/models
QMAKE_POST_LINK += && cp -r $$BASEDIR/models $$TARGETDIR/release/models
}
}
} else {
# No cp command available, go for copy / xcopy
# Copy dependencies
message("Using copy / xcopy to copy image and audio files to executable (cp command not found)")
BASEDIR_WIN = $$replace(BASEDIR,"/","\\")
TARGETDIR_WIN = $$replace(TARGETDIR,"/","\\")
debug {
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\"
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\debug\\audio\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\" /S /E /Y
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR\\images\\earth.html $$TARGETDIR_WIN\\debug\"
}
release {
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\release\\SDL.dll\"
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\release\\audio\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\release\\models\" /S /E /Y
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR\\images\\earth.html $$TARGETDIR_WIN\\release\"
}
}
# osg/osgEarth dynamic casts might fail without this compiler option.
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
# see http://osgearth.org/wiki/FAQ for details.
QMAKE_CXXFLAGS += -Wl,-E
QMAKE_CXXFLAGS += -Wl,-E
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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