Skip to content

Q
qgroundcontrol
Commit 3de22ca5 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #1440 from dogmaphobic/qmakeWindowsFix 

Fixing QMake project for Windows
parents 40df5080 20a5b69b
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
QGCExternalLibs.pri
View file @ 3de22ca5
...@@ -376,11 +376,12 @@ contains (DEFINES, DISABLE_SPEECH) { ...@@ -376,11 +376,12 @@ contains (DEFINES, DISABLE_SPEECH) {
} }
# Mac support is built into OS 10.6+. # Mac support is built into OS 10.6+.
else:MacBuild { else:MacBuild {
message("Including support for speech output") message("Including support for speech output")
DEFINES += QGC_SPEECH_ENABLED DEFINES += QGC_SPEECH_ENABLED
} }
# Windows supports speech through native API. # Windows supports speech through native API.
else:WindowsBuild { else:WindowsBuild {
message("Including support for speech output") message("Including support for speech output")
DEFINES += QGC_SPEECH_ENABLED DEFINES += QGC_SPEECH_ENABLED
LIBS += -lOle32
} }
QGCSetup.pri
View file @ 3de22ca5
...@@ -151,13 +151,13 @@ MacBuild { ...@@ -151,13 +151,13 @@ MacBuild {
} }
WindowsBuild { WindowsBuild {
BASEDIR_WIN = $$replace(BASEDIR, "/", "\\") BASEDIR_WIN = $$replace(BASEDIR, "/", "\\")
DESTDIR_WIN = $$replace(DESTDIR, "/", "\\") DESTDIR_WIN = $$replace(DESTDIR, "/", "\\")
D_DIR = $$[QT_INSTALL_LIBEXECS] D_DIR = $$[QT_INSTALL_LIBEXECS]
DLL_DIR = $$replace(D_DIR, "/", "\\") DLL_DIR = $$replace(D_DIR, "/", "\\")
# Copy dependencies # Copy dependencies
DebugBuild: DLL_QT_DEBUGCHAR = "d" DebugBuild: DLL_QT_DEBUGCHAR = "d"
ReleaseBuild: DLL_QT_DEBUGCHAR = "" ReleaseBuild: DLL_QT_DEBUGCHAR = ""
COPY_FILE_LIST = \ COPY_FILE_LIST = \
$$BASEDIR\\libs\\lib\\sdl\\win32\\SDL.dll \ $$BASEDIR\\libs\\lib\\sdl\\win32\\SDL.dll \
...@@ -188,12 +188,12 @@ WindowsBuild { ...@@ -188,12 +188,12 @@ WindowsBuild {
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\" QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
} }
# Copy platform plugins # Copy platform plugins
P_DIR = $$[QT_INSTALL_PLUGINS] P_DIR = $$[QT_INSTALL_PLUGINS]
PLUGINS_DIR_WIN = $$replace(P_DIR, "/", "\\") PLUGINS_DIR_WIN = $$replace(P_DIR, "/", "\\")
QMAKE_POST_LINK += $$escape_expand(\\n) mkdir release\\platforms QMAKE_POST_LINK += $$escape_expand(\\n) mkdir "$$DESTDIR_WIN\\platforms"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$PLUGINS_DIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\" \"$$DESTDIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\" QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$PLUGINS_DIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\" \"$$DESTDIR_WIN\\platforms\\qwindows$${DLL_QT_DEBUGCHAR}.dll\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\imageformats\" \"$$DESTDIR_WIN\\imageformats\" QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\imageformats\" \"$$DESTDIR_WIN\\imageformats\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\sqldrivers\" \"$$DESTDIR_WIN\\sqldrivers\" QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\sqldrivers\" \"$$DESTDIR_WIN\\sqldrivers\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\bearer\" \"$$DESTDIR_WIN\\bearer\" QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\bearer\" \"$$DESTDIR_WIN\\bearer\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\iconengines\" \"$$DESTDIR_WIN\\iconengines\" QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\iconengines\" \"$$DESTDIR_WIN\\iconengines\"
......
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