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

CMake: Explicitly ask for C99 support

Browse Source 
Otherwise using a compiler that defaults to -std=c89 or -std=gnu89 will
fail. Example:
http://www.cpantesters.org/cpan/report/abb85066-d283-11e7-9926-b2f4efb9c382

Apparently, -m32 Travis CI build was broken: -m32 was overridden by
-std=gnu99.  This fixes that.
This commit is contained in:
Ahmad Fatoum 2017-11-27 01:24:08 +01:00
parent 7099e4ea4d
commit ca921e5a53
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.travis.yml
View File

@ -1,28 +1,24 @@
language: c language: c
sudo: required
dist: trusty dist: trusty
git: git:
depth: 3 depth: 3
os: # TODO we could use a 32 bit Docker container for running true 32-bit tests
- osx # services: - docker
- linux
env: matrix: # We don't install x11 32-bit libraries, so skip shared libraries on -m32
global: include:
- VERBOSE=1 - os: linux
matrix: # We don't install x11 32-bit libraries, so skip shared libraries on -m32 env: ARCH=i386 SHARED=OFF EXAMPLES=OFF
- ARCH=i386 SHARED=OFF sudo: required
- ARCH=amd64 SHARED=ON - os: linux
env: ARCH=amd64 SHARED=ON EXAMPLES=ON
matrix: sudo: required
exclude: # This is already covered by building universal (fat) libraries by default - os: osx
- os: osx env: ARCH=amd64 SHARED=ON EXAMPLES=ON
env: ARCH=i386 SHARED=OFF
before_script: before_script:
- export CFLAGS="-std=gnu99"
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
@ -32,8 +28,8 @@ before_install:
mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev
libgl1-mesa-dev libglu1-mesa-dev libglew-dev; libgl1-mesa-dev libglu1-mesa-dev libglew-dev;
export RAYLIB_PACKAGE_SUFFIX="-Linux-$ARCH"; export RAYLIB_PACKAGE_SUFFIX="-Linux-$ARCH";
if [ "$ARCH" == "i386" ]; then export CFLAGS="$CFLAGS -m32"; fi; if [ "$ARCH" == "i386" ]; then export CFLAGS="-m32"; fi;
if [ "$ARCH" == "amd64" ]; then export CFLAGS="$CFLAGS -m64"; fi; if [ "$ARCH" == "amd64" ]; then export CFLAGS="-m64"; fi;
fi fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export RAYLIB_PACKAGE_SUFFIX="-macOS"; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export RAYLIB_PACKAGE_SUFFIX="-macOS"; fi
- "$CC --version" - "$CC --version"
@ -41,8 +37,8 @@ before_install:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake -DMACOS_FATLIB=ON -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=$SHARED .. - cmake -DMACOS_FATLIB=ON -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=$SHARED -DBUILD_EXAMPLES=$EXAMPLES -DBUILD_GAMES=$EXAMPLES ..
- make - make VERBOSE=1
- make package - make package
deploy: deploy:

8
CMakeLists.txt
View File

@ -4,6 +4,14 @@ cmake_minimum_required(VERSION 3.0)
set(BUILD_EXAMPLES ON CACHE BOOL "Build the examples.") set(BUILD_EXAMPLES ON CACHE BOOL "Build the examples.")
set(BUILD_GAMES ON CACHE BOOL "Build the example games.") set(BUILD_GAMES ON CACHE BOOL "Build the example games.")
if(CMAKE_VERSION VERSION_LESS "3.1")
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
endif()
else()
set (CMAKE_C_STANDARD 99)
endif()
add_subdirectory(src release) add_subdirectory(src release)
if (${BUILD_EXAMPLES}) if (${BUILD_EXAMPLES})