flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup in qmake files.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-11-10 02:32:08 +00:00
committed by Klaus Basan
parent f60f46bcda
commit c43c1458f4
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docs.pro
View File

@@ -8,7 +8,7 @@ OTHER_FILES += Doxyfile.qmake
OTHER_FILES += src/*.dox
OTHER_FILES += src/wiki/*.dox
win32: DOXYGEN_BIN = $$system(where doxygen)
win32: DOXYGEN_BIN = $$system($$(SYSTEMROOT)\system32\where doxygen)
else: DOXYGEN_BIN = $$system(which doxygen)
isEmpty(DOXYGEN_BIN) {

10
mkspecs/features/common_pre.prf
View File

@@ -58,21 +58,17 @@ contains(TEMPLATE, "vc.*"): QMAKE_CXXFLAGS *= /MP
################################
contains(BLACK_CONFIG, ProfileRelease) {
win32-msvc* {
msvc {
QMAKE_CXXFLAGS_RELEASE *= /Zi
QMAKE_LFLAGS_RELEASE *= /DEBUG /PROFILE /INCREMENTAL:NO /OPT:REF /OPT:ICF
}
}
# Needed to workaround C1128 error
# TODO check whether this is still needed after CValueObject refactoring
win32-msvc*: QMAKE_CXXFLAGS *= /bigobj
################################
# No incremental build
# Workaround C1128 error
################################
# win32-msvc*:QMAKE_LFLAGS_DEBUG *= /INCREMENTAL:NO
msvc: QMAKE_CXXFLAGS *= /bigobj
################################
# No gigantic MinGW obj files

4
mkspecs/features/wordsize.pri
View File

@@ -1,5 +1,5 @@
win32-msvc* {
win32:contains(QMAKE_TARGET.arch, x86_64) {
msvc {
contains(QMAKE_TARGET.arch, x86_64) {
WORD_SIZE = 64
}
else {

2
src/blackcore/blackcore.pro
View File

@@ -41,7 +41,7 @@ LIBS *= -lvatlib
DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$DestRoot/bin
win32-msvc* {
msvc {
CONFIG(debug, debug|release): LIBS *= -lcrashpad_clientd -lcrashpad_utild -lbased -lRpcrt4
CONFIG(release, debug|release): LIBS *= -lcrashpad_client -lcrashpad_util -lbase -lRpcrt4
}

4
src/xbus/xbus.pro
View File

@@ -44,14 +44,14 @@ HEADERS -= libxplanemp/src/PlatformUtils.h
# Externals required by libxplanemp
CONFIG += opengl
win32-msvc* {
msvc {
CONFIG(debug, debug|release): LIBS += -lpngd -lzd -lopengl32 -lglu32
CONFIG(release, debug|release): LIBS += -lpng -lz -lopengl32 -lglu32
}
else:win32: LIBS += -lpng -lz -lopengl32 -lglu32
else: LIBS += -lpng -lz
win32-msvc*: DEFINES += _CRT_SECURE_NO_WARNINGS
msvc: DEFINES += _CRT_SECURE_NO_WARNINGS
# Required by X-Plane SDK and libxplanemp
win32:DEFINES += IBM=1