diff options
| author | Ray <[email protected]> | 2017-12-14 13:47:25 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-12-14 13:47:25 +0100 |
| commit | 35d54dd7e4b317cb7c7a2c89db420335d3d9870c (patch) | |
| tree | 46d2c5752266df259eeb68009043868b02405b00 | |
| parent | 2388cbc3cd73ab228a4d60f05becd51035c703ea (diff) | |
| parent | 263e81b5c92a575b35e44a33b4b5f833489073a0 (diff) | |
| download | raylib-35d54dd7e4b317cb7c7a2c89db420335d3d9870c.tar.gz raylib-35d54dd7e4b317cb7c7a2c89db420335d3d9870c.zip | |
Merge pull request #421 from a3f/develop
Build shared libs, games and examples on CI
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | appveyor.yml | 6 |
2 files changed, 14 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 7d1ffef0..62278cd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,26 +7,26 @@ git: # TODO we could use a 32 bit Docker container for running true 32-bit tests # services: - docker -matrix: # We don't install x11 32-bit libraries, so skip shared libraries on -m32 +matrix: include: - os: linux - env: ARCH=i386 SHARED=OFF EXAMPLES=OFF + env: ARCH=i386 sudo: required - os: linux - env: ARCH=amd64 SHARED=ON EXAMPLES=ON + env: ARCH=amd64 sudo: required - os: osx - env: ARCH=amd64 SHARED=ON EXAMPLES=ON + env: ARCH=amd64 before_script: before_install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y gcc-multilib - libasound2-dev - libxcursor-dev libxinerama-dev - mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev - libgl1-mesa-dev libglu1-mesa-dev libglew-dev; + libasound2-dev:$ARCH + libxcursor-dev:$ARCH libxinerama-dev:$ARCH mesa-common-dev:$ARCH + libx11-dev:$ARCH libxrandr-dev:$ARCH libxi-dev:$ARCH + libgl1-mesa-dev:$ARCH libglu1-mesa-dev:$ARCH libglew-dev:$ARCH; export RAYLIB_PACKAGE_SUFFIX="-Linux-$ARCH"; if [ "$ARCH" == "i386" ]; then export CFLAGS="-m32"; fi; if [ "$ARCH" == "amd64" ]; then export CFLAGS="-m64"; fi; @@ -37,7 +37,7 @@ before_install: script: - mkdir build - cd build - - cmake -DMACOS_FATLIB=ON -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=$SHARED -DBUILD_EXAMPLES=$EXAMPLES -DBUILD_GAMES=$EXAMPLES .. + - cmake -DMACOS_FATLIB=ON -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=ON -DBUILD_EXAMPLES=ON -DBUILD_GAMES=ON .. - make VERBOSE=1 - make package diff --git a/appveyor.yml b/appveyor.yml index a8572d07..4148e744 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,12 +20,16 @@ environment: matrix: - compiler: mingw bits: 32 + examples: ON - compiler: mingw bits: 64 + examples: ON - compiler: msvc15 bits: 32 + examples: OFF - compiler: msvc15 bits: 64 + examples: OFF before_build: - if [%compiler%]==[mingw] set CFLAGS=-m%BITS% & set LDFLAGS=-m%BITS% & set GENERATOR="MinGW Makefiles" @@ -35,7 +39,7 @@ before_build: - cd build build_script: - - cmake -G %GENERATOR% -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GAMES=OFF .. + - cmake -G %GENERATOR% -DSTATIC_RAYLIB=ON -DSHARED_RAYLIB=ON -DBUILD_EXAMPLES=%examples% -DBUILD_GAMES=%examples% .. - cmake --build . --target install after_build: |