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
This commit is contained in:
Klaus Basan
2015-04-19 02:53:41 +02:00
parent dba47d6c8c
commit dffb2e3581
3 changed files with 9 additions and 5 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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
}