mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-05 14:15:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix for travis

Browse Source
This commit is contained in:
deltaoscarmike
2018-07-25 20:17:08 +02:00
parent 7628fd018c
commit 00a2a70743
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

8
configure.ac
View File

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