From c43c1458f4462cbf54107a43b8936cb09b5c693b Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Thu, 10 Nov 2016 02:32:08 +0000
Subject: [PATCH] Minor cleanup in qmake files.

---
 docs/docs.pro                   |  2 +-
 mkspecs/features/common_pre.prf | 10 +++-------
 mkspecs/features/wordsize.pri   |  4 ++--
 src/blackcore/blackcore.pro     |  2 +-
 src/xbus/xbus.pro               |  4 ++--
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/docs/docs.pro b/docs/docs.pro
index ef0319863..0fa5b49da 100644
--- a/docs/docs.pro
+++ b/docs/docs.pro
@@ -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) {
diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf
index cc73e08d1..4dd456c6a 100644
--- a/mkspecs/features/common_pre.prf
+++ b/mkspecs/features/common_pre.prf
@@ -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
diff --git a/mkspecs/features/wordsize.pri b/mkspecs/features/wordsize.pri
index f7a5d531d..80ffcb7f6 100644
--- a/mkspecs/features/wordsize.pri
+++ b/mkspecs/features/wordsize.pri
@@ -1,5 +1,5 @@
-win32-msvc* {
-    win32:contains(QMAKE_TARGET.arch, x86_64) {
+msvc {
+    contains(QMAKE_TARGET.arch, x86_64) {
         WORD_SIZE = 64
     }
     else {
diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro
index 0a9ddd6a9..17b0449fb 100644
--- a/src/blackcore/blackcore.pro
+++ b/src/blackcore/blackcore.pro
@@ -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
 }
diff --git a/src/xbus/xbus.pro b/src/xbus/xbus.pro
index b60b1ba0a..8ec25cc67 100644
--- a/src/xbus/xbus.pro
+++ b/src/xbus/xbus.pro
@@ -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