From 263e81b5c92a575b35e44a33b4b5f833489073a0 Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <ahmad@a3f.at>
Date: Thu, 14 Dec 2017 12:20:05 +0100
Subject: [PATCH] Build shared libs, games and examples on CI

Now with external OpenAL and GLFW dependencies removed,
we don't have to worry about installing them in CI.
Shared libraries are now always built along with static libs.
Games and examples are built everwhere except for Visual Studio,
because Physac needs pthreads, which VS doesn't provide.
---
 .travis.yml  | 18 +++++++++---------
 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: