Skip to content

Q
qgroundcontrol
Commit f2c50190 authored by Nate Weibley's avatar Nate Weibley
Browse files
Options

Add note to Windows developers to turn off -MP when using jom. Specify we're using jom in appveyor

parent 23399a22
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
.appveyor.yml
View file @ f2c50190
...@@ -14,7 +14,7 @@ install: ...@@ -14,7 +14,7 @@ install:
- cinst nsis -y -installArgs /D="%programfiles(x86)%\NSIS" - cinst nsis -y -installArgs /D="%programfiles(x86)%\NSIS"
build_script: build_script:
- C:\Qt\5.4\msvc2013_opengl\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn qgroundcontrol.pro - C:\Qt\5.4\msvc2013_opengl\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn CONFIG+=jombuild qgroundcontrol.pro
- jom -j 4 - jom -j 4
test_script: test_script:
......
QGCCommon.pri
View file @ f2c50190
...@@ -168,8 +168,11 @@ WindowsBuild { ...@@ -168,8 +168,11 @@ WindowsBuild {
DEFINES += __STDC_LIMIT_MACROS DEFINES += __STDC_LIMIT_MACROS
# Specify multi-process compilation within Visual Studio. # Specify multi-process compilation within Visual Studio.
# (drastically improves compilation times for multi-core computers) # (drastically improves compilation times for multi-core computers)
QMAKE_CXXFLAGS_DEBUG += -MP !jombuild {
QMAKE_CXXFLAGS_RELEASE += -MP message("When using jom/QtCreator please add CONFIG+=jombuild to your project build settings")
QMAKE_CXXFLAGS_DEBUG += -MP
QMAKE_CXXFLAGS_RELEASE += -MP
}
} }
# #
......
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