From 18b4fe0b45e30131692533de86e368820bdae395 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Fri, 17 Nov 2017 10:41:08 +0300 Subject: [PATCH] testing g++ build --- .travis.yml | 7 ++++++- Makefile.osx | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9112bff..9ba59ab5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: cpp cache: apt: true + directories: + - $HOME/Library/Caches/Homebrew os: - - linux + # - linux - osx sudo: required dist: stretch @@ -32,6 +34,9 @@ env: matrix: - BUILD_TYPE=Release UPNP=ON - BUILD_TYPE=Release UPNP=OFF + exclude: + - os: osx + compiler: g++ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_UPNP=${UPNP} && make ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make HOMEBREW=1 USE_UPNP=${UPNP} ; fi diff --git a/Makefile.osx b/Makefile.osx index 8d6a1c65..1a480dde 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -1,4 +1,4 @@ -CXX = clang++ +#CXX = clang++ CXXFLAGS = -Os -Wall -std=c++11 -DMAC_OSX #CXXFLAGS = -g -O2 -Wall -std=c++11 INCFLAGS = -I/usr/local/include