From dffb2e358130d88858d9f6219eb94aade486ba89 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 19 Apr 2015 02:53:41 +0200
Subject: [PATCH] Some build adjustements: * Warning flags for elevated
 warnings as discussed: no /W3, explicit /wd * fixed include in hotkey samples
 * removed outdated QMAKE_CXXFLAGS += -std=c++0x

---
 build.pri                        | 10 ++++++++--
 samples/hotkey/sample_hotkey.pro |  2 +-
 src/blackcore/blackcore.pro      |  2 --
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.pri b/build.pri
index cfa8f6ffe..a18946f84 100644
--- a/build.pri
+++ b/build.pri
@@ -89,7 +89,6 @@ win32-g++: QMAKE_CXXFLAGS_DEBUG += -Og
 ###########################
 # No FSX or FS9 for 64 bit
 ###########################
-
 equals(WORD_SIZE,64): BLACK_CONFIG -= FSX FS9
 
 ###########################
@@ -97,8 +96,15 @@ equals(WORD_SIZE,64): BLACK_CONFIG -= FSX FS9
 ###########################
 win32-msvc*:DEFINES *= _SCL_SECURE_NO_WARNINGS
 # win32-msvc*:QMAKE_CXXFLAGS *=
+
+# exclude Qt lib warnings
+# win32-g++: QMAKE_CXXFLAGS +=  $$join(QMAKE_INCDIR_QT, " -isystem", "-isystem")
+
+# swift standard warnings
 win32-msvc*:QMAKE_CXXFLAGS_WARN_ON *= /wd4351
-# win32-msvc*:QMAKE_CXXFLAGS_WARN_ON *= /Wall /W3 /wd4640 /wd4619 /wd4350 /wd4351 /wd4946
+
+# elevated warnings
+# win32-msvc*:QMAKE_CXXFLAGS_WARN_ON *= /Wall /wd4640 /wd4619 /wd4350 /wd4351 /wd4946 /wd4510 /wd4820 /wd4571 /wd4625 /wd4626 /wd4127
 
 ################################
 # Defines for conditional compilation
diff --git a/samples/hotkey/sample_hotkey.pro b/samples/hotkey/sample_hotkey.pro
index d9622d353..64696a423 100644
--- a/samples/hotkey/sample_hotkey.pro
+++ b/samples/hotkey/sample_hotkey.pro
@@ -19,7 +19,7 @@ HEADERS += *.h
 
 win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \
                                      ../../lib/blackcore.lib \
-                                     ../../lib/libblackinput.a
+                                     ../../lib/blackinput.lib
 else:              PRE_TARGETDEPS += ../../lib/libblackmisc.a \
                                      ../../lib/libblackcore.a \
                                      ../../lib/libblackinput.a
diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro
index c736dd81d..b2c4f526b 100644
--- a/src/blackcore/blackcore.pro
+++ b/src/blackcore/blackcore.pro
@@ -13,9 +13,7 @@ CONFIG += blackmisc blackinput
 INCLUDEPATH += ..
 DEPENDPATH += . ..
 
-# linux-g++* { QMAKE_CXXFLAGS += -std=c++0x }
 # PRECOMPILED_HEADER = stdpch.h
-
 precompile_header:!isEmpty(PRECOMPILED_HEADER) {
     DEFINES += USING_PCH
 }