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
3347d285
Commit
3347d285
authored
Jan 02, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed release/debug DLLs in Windows
Also fixed a number of other release build problems
parent
c1465a0f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
29 deletions
+25
-29
QGCSetup.pri
QGCSetup.pri
+20
-26
qgroundcontrol.pro
qgroundcontrol.pro
+3
-3
main.cc
src/main.cc
+2
-0
No files found.
QGCSetup.pri
View file @
3347d285
...
...
@@ -157,46 +157,40 @@ WindowsBuild {
BASEDIR_WIN = $$replace(BASEDIR,"/","\\")
DESTDIR_WIN = $$replace(DESTDIR,"/","\\")
DebugBuild {
COPY_FILE_DESTDIR = $$DESTDIR_WIN\\debug
}
ReleaseBuild {
COPY_FILE_DESTDIR = $$DESTDIR_WIN\\release
}
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote($$QMAKE_COPY_DIR "$$(QTDIR)\\plugins" "$$DESTDIR_WIN\\debug")
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote($$QMAKE_COPY_DIR "$$(QTDIR)\\plugins" "$$DESTDIR_WIN")
COPY_FILE_DESTDIR = $$DESTDIR_WIN
DebugBuild: DLL_QT_DEBUGCHAR = "d"
ReleaseBuild: DLL_QT_DEBUGCHAR = ""
COPY_FILE_LIST = \
$$BASEDIR_WIN\\libs\\lib\\sdl\\win32\\SDL.dll \
$$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll \
$$(QTDIR)\\bin\\phonon
d
4.dll \
$$(QTDIR)\\bin\\QtCore
d
4.dll \
$$(QTDIR)\\bin\\QtGui
d
4.dll \
$$(QTDIR)\\bin\\QtMultimedia
d
4.dll \
$$(QTDIR)\\bin\\QtNetwork
d
4.dll \
$$(QTDIR)\\bin\\QtOpenGL
d
4.dll \
$$(QTDIR)\\bin\\QtSql
d
4.dll \
$$(QTDIR)\\bin\\QtSvg
d
4.dll \
$$(QTDIR)\\bin\\QtTest
d
4.dll \
$$(QTDIR)\\bin\\QtWebKit
d
4.dll \
$$(QTDIR)\\bin\\QtXml
d
4.dll \
$$(QTDIR)\\bin\\QtXmlPatterns
d
4.dll \
$$(QTDIR)\\bin\\QtDeclarative
d
4.dll \
$$(QTDIR)\\bin\\QtScript
d
4.dll
$$(QTDIR)\\bin\\phonon
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtCore
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtGui
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtMultimedia
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtNetwork
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtOpenGL
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtSql
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtSvg
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtTest
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtWebKit
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtXml
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtXmlPatterns
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtDeclarative
$${DLL_QT_DEBUGCHAR}
4.dll \
$$(QTDIR)\\bin\\QtScript
$${DLL_QT_DEBUGCHAR}
4.dll
for(COPY_FILE, COPY_FILE_LIST) {
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote($$QMAKE_COPY "$$COPY_FILE" "$$COPY_FILE_DESTDIR")
}
ReleaseBuild {
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\release\\$${TARGET}.exp")
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\release\\$${TARGET}")
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp")
# Copy Visual Studio DLLs
# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
# I'm not certain of the path for VS2008, so this only works for VS2010.
win32-msvc2010 {
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\"" "$$DESTDIR_WIN\\
release\\
")
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\"" "$$DESTDIR_WIN\\")
}
}
}
qgroundcontrol.pro
View file @
3347d285
...
...
@@ -79,6 +79,9 @@ QT += network \
webkit
\
sql
\
declarative
#
testlib
is
needed
even
in
release
flavor
for
QSignalSpy
support
QT
+=
testlib
#
Turn
off
serial
port
warnings
DEFINES
+=
_TTY_NOWARN_
...
...
@@ -136,9 +139,6 @@ ReleaseBuild {
#
DebugBuild
{
QT
+=
testlib
INCLUDEPATH
+=
\
src
/
qgcunittest
...
...
src/main.cc
View file @
3347d285
...
...
@@ -32,7 +32,9 @@ This file is part of the QGROUNDCONTROL project
#include "QGCCore.h"
#include "MainWindow.h"
#include "configuration.h"
#ifdef QT_DEBUG
#include "AutoTest.h"
#endif
/* SDL does ugly things to main() */
#ifdef main
...
...
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