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. --- gaddagize/gaddagize.pro | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gaddagize/gaddagize.pro') diff --git a/gaddagize/gaddagize.pro b/gaddagize/gaddagize.pro index 505c237..2915317 100755 --- a/gaddagize/gaddagize.pro +++ b/gaddagize/gaddagize.pro @@ -6,7 +6,7 @@ INCLUDEPATH += . .. # CONFIG += debug CONFIG += release -CONFIG += console +CONFIG += console c++14 CONFIG -= app_bundle debug { @@ -17,7 +17,9 @@ release { OBJECTS_DIR = obj/release } -QMAKE_CXXFLAGS:!win32-msvc2013 += -std=c++11 -Wno-unknown-warning-option -Wno-deprecated-register +!msvc { + QMAKE_CXXFLAGS += -Wno-unknown-warning-option -Wno-deprecated-register +} # Input SOURCES += gaddagize.cpp @@ -26,3 +28,7 @@ SOURCES += gaddagize.cpp macx-g++ { QMAKE_CXXFLAGS += -fpermissive } + +linux { # old unixes/Qt distribs running around...most notably on Travis-CI + QMAKE_CXXFLAGS += -std=c++1y +} -- cgit v1.2.3