From 00a2a70743fe5c3ae02883f7f59af49db0b776c9 Mon Sep 17 00:00:00 2001 From: deltaoscarmike <37912794+deltaoscarmike@users.noreply.github.com> Date: Wed, 25 Jul 2018 20:17:08 +0200 Subject: [PATCH] Fix for travis --- .travis.yml | 2 ++ configure.ac | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80d06ac4f..7eb69990f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,7 @@ matrix: - libglew-dev - libftgl-dev - libglm-dev + - libc++-dev env: - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" # linux/gcc @@ -48,6 +49,7 @@ matrix: - libglew-dev - libftgl-dev - libglm-dev + - libc++-dev env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" diff --git a/configure.ac b/configure.ac index ca63c0504..7de7e6dfb 100644 --- a/configure.ac +++ b/configure.ac @@ -76,11 +76,11 @@ AC_PREFIX_DEFAULT([/usr/local]) AC_PROG_MKDIR_P -AX_CHECK_COMPILE_FLAG([-stdlib=libstdc++], [ - CXXFLAGS="$CXXFLAGS -stdlib=libstdc++"]) +AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [ + CXXFLAGS="$CXXFLAGS -stdlib=libc++"]) -AX_CHECK_COMPILE_FLAG([-std=c++14], [ - CXXFLAGS="$CXXFLAGS -std=c++14"]) +AX_CHECK_COMPILE_FLAG([-std=c++11], [ + CXXFLAGS="$CXXFLAGS -std=c++11"]) dnl Qt AC_ARG_ENABLE([qt],