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
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
QGCExternalLibs.pri
View file @ 3de22ca5
......@@ -383,4 +383,5 @@ else:MacBuild {
else:WindowsBuild {
message("Including support for speech output")
DEFINES += QGC_SPEECH_ENABLED
LIBS += -lOle32
}
QGCSetup.pri
View file @ 3de22ca5
......@@ -191,7 +191,7 @@ WindowsBuild {
# Copy platform plugins
P_DIR = $$[QT_INSTALL_PLUGINS]
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_DIR \"$$PLUGINS_DIR_WIN\\imageformats\" \"$$DESTDIR_WIN\\imageformats\"
QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY_DIR \"$$PLUGINS_DIR_WIN\\sqldrivers\" \"$$DESTDIR_WIN\\sqldrivers\"
......
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