MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Travis CI: Bump used GCC from 4.8 to 5

Browse Source 
Otherwise, dr_flac -DWITH_PIC=ON fails because cpuid clobbers %ebx as
well.
This commit is contained in:
Ahmad Fatoum 2018-07-27 19:40:32 +02:00
parent c2fe0af0a9
commit a143cea893
No known key found for this signature in database
GPG Key ID: C3EAC3DE9321D59B
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -11,14 +11,20 @@ services:
matrix: matrix:
include: include:
- os: linux - os: linux
env: ARCH=i386 env: ARCH=i386 SHARED=OFF
sudo: required sudo: required
- os: linux - os: linux
env: ARCH=amd64 INSTALL_GLFW=YES USE_EXTERNAL_GLFW=OFF env: ARCH=amd64 INSTALL_GLFW=YES USE_EXTERNAL_GLFW=OFF
sudo: required sudo: required
- os: linux - os: linux
env: ARCH=amd64 INSTALL_GLFW=YES OPENAL=YES STATIC=OFF RELEASE=NO env: ARCH=amd64 INSTALL_GLFW=YES OPENAL=ON STATIC=OFF RELEASE=NO
sudo: required sudo: required
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-5
- os: linux - os: linux
env: WAYLAND=ON ARCH=amd64 RELEASE=NO env: WAYLAND=ON ARCH=amd64 RELEASE=NO
sudo: required sudo: required
@ -41,11 +47,12 @@ matrix:
sudo: required sudo: required
- os: linux - os: linux
env: ARCH=html5 RELEASE=NO env: ARCH=html5 RELEASE=NO
sudo: required sudo: requir
before_script: before_script:
before_install: before_install:
- if [ -x "$(which gcc-5)" ]; then export CC=gcc-5; fi
- if [ -z "$USE_EXTERNAL_GLFW" ]; then USE_EXTERNAL_GLFW=IF_POSSIBLE; fi - if [ -z "$USE_EXTERNAL_GLFW" ]; then USE_EXTERNAL_GLFW=IF_POSSIBLE; fi
- if [ -z "$SHARED" ]; then SHARED=ON ; fi - if [ -z "$SHARED" ]; then SHARED=ON ; fi
- if [ -z "$STATIC" ]; then STATIC=ON ; fi - if [ -z "$STATIC" ]; then STATIC=ON ; fi
@ -80,6 +87,8 @@ before_install:
libxcursor-dev:$ARCH libxinerama-dev:$ARCH mesa-common-dev:$ARCH libxcursor-dev:$ARCH libxinerama-dev:$ARCH mesa-common-dev:$ARCH
libx11-dev:$ARCH libxrandr-dev:$ARCH libxrandr2:$ARCH libxi-dev:$ARCH libx11-dev:$ARCH libxrandr-dev:$ARCH libxrandr2:$ARCH libxi-dev:$ARCH
libgl1-mesa-dev:$ARCH libglu1-mesa-dev:$ARCH; libgl1-mesa-dev:$ARCH libglu1-mesa-dev:$ARCH;
if [ "$OPENAL" == "ON" ]; then sudo apt-get install -y libopenal-dev; fi;
if [ "$ARCH" == "i386" ]; then CMAKE_ARCH_ARGS='-DCMAKE_C_FLAGS=-m32 -DCMAKE_SYSTEM_LIBRARY_PATH=/usr/lib/i386-linux-gnu'; fi; if [ "$ARCH" == "i386" ]; then CMAKE_ARCH_ARGS='-DCMAKE_C_FLAGS=-m32 -DCMAKE_SYSTEM_LIBRARY_PATH=/usr/lib/i386-linux-gnu'; fi;
export RAYLIB_PACKAGE_SUFFIX="-Linux-$ARCH"; export RAYLIB_PACKAGE_SUFFIX="-Linux-$ARCH";
if [ "$INSTALL_GLFW" == "YES" ]; then if [ "$INSTALL_GLFW" == "YES" ]; then
@ -108,7 +117,6 @@ script:
fi fi
- $RUNNER cmake $CMAKE_ARCH_ARGS - $RUNNER cmake $CMAKE_ARCH_ARGS
-DMACOS_FATLIB=ON -DMACOS_FATLIB=ON
-DSTATIC=ON -DSHARED=$SHARED
-DSTATIC=$STATIC -DSHARED=$SHARED -DSTATIC=$STATIC -DSHARED=$SHARED
-DBUILD_EXAMPLES=ON -DBUILD_GAMES=ON -DBUILD_EXAMPLES=ON -DBUILD_GAMES=ON
-DUSE_EXTERNAL_GLFW=$USE_EXTERNAL_GLFW -DUSE_EXTERNAL_GLFW=$USE_EXTERNAL_GLFW

2
src/CMakeOptions.txt
View File

@ -69,7 +69,7 @@ option(SUPPORT_FILEFORMAT_WAV "Support loading WAV for sound" ON)
option(SUPPORT_FILEFORMAT_OGG "Support loading OGG for sound" ON) option(SUPPORT_FILEFORMAT_OGG "Support loading OGG for sound" ON)
option(SUPPORT_FILEFORMAT_XM "Support loading XM for sound" ON) option(SUPPORT_FILEFORMAT_XM "Support loading XM for sound" ON)
option(SUPPORT_FILEFORMAT_MOD "Support loading MOD for sound" ON) option(SUPPORT_FILEFORMAT_MOD "Support loading MOD for sound" ON)
option(SUPPORT_FILEFORMAT_FLAC "Support loading FLAC for sound" ${OFF}) option(SUPPORT_FILEFORMAT_FLAC "Support loading FLAC for sound" OFF)
# utils.c # utils.c
option(SUPPORT_SAVE_PNG "Support saving image data in PNG file format" ON) option(SUPPORT_SAVE_PNG "Support saving image data in PNG file format" ON)