From b3672501e03144a7ad56e6751694697a0d23e240 Mon Sep 17 00:00:00 2001 From: John Fultz Date: Thu, 10 Aug 2017 00:08:04 -0500 Subject: Add OS X builds to Travis-CI. Also, add a bit of parallelization, do a few other cleanups on the yml and .pro files. And push C++14 flags everywhere into the build system. --- quacker/quacker.pro | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'quacker') diff --git a/quacker/quacker.pro b/quacker/quacker.pro index e924e86..ae12c34 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -15,6 +15,8 @@ CONFIG += release #qmake messes up resulting Visual Studio project files. CONFIG -= debug +CONFIG += c++14 + debug { OBJECTS_DIR = obj/debug QMAKE_LIBDIR += ../lib/debug ../quackleio/lib/debug @@ -32,8 +34,9 @@ win32:!win32-g++ { } macx:LIBS += -framework CoreFoundation -QMAKE_CXXFLAGS += -std=c++11 -#QMAKE_CXXFLAGS:!win32-msvc2013 += -Wno-unknown-warning-option -Wno-deprecated-register +!msvc { + QMAKE_CXXFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register +} # Input HEADERS += *.h @@ -71,3 +74,7 @@ macx-g++ { unix:!macx { QMAKE_CXXFLAGS += -Wno-unused-local-typedefs } + +linux { # old unixes/Qt distribs running around...most notably on Travis-CI + QMAKE_CXXFLAGS += -std=c++1y +} -- cgit v1.2.3