Forráskód Böngészése

CI: Build with all optional formats enabled

also makes one configuration shared-only

dr_flac is not built on i386, because GCC 4.8 complains about asm("cpuid"
clobbering ebx, as it's using ebx for PIC.

Instead of downloading a newer GCC (and multilib),
disable FLAC for that one configuration...
Ahmad Fatoum 7 éve
szülő
commit
3e5093eab0
3 módosított fájl, 19 hozzáadás és 13 törlés
  1. 6 3
      .travis.yml
  2. 1 1
      appveyor.yml
  3. 12 9
      src/CMakeOptions.txt

+ 6 - 3
.travis.yml

@@ -17,7 +17,7 @@ matrix:
       env: ARCH=amd64 INSTALL_GLFW=YES USE_EXTERNAL_GLFW=OFF
       sudo: required
     - os: linux
-      env: ARCH=amd64 INSTALL_GLFW=YES OPENAL=ON RELEASE=NO
+      env: ARCH=amd64 INSTALL_GLFW=YES OPENAL=ON STATIC=OFF RELEASE=NO
       sudo: required
     - os: linux
       env: WAYLAND=ON ARCH=amd64 RELEASE=NO
@@ -48,6 +48,7 @@ before_script:
 before_install:
   - if [ -z "$USE_EXTERNAL_GLFW" ]; then USE_EXTERNAL_GLFW=IF_POSSIBLE; fi
   - if [ -z "$SHARED"            ]; then            SHARED=ON         ; fi
+  - if [ -z "$STATIC"            ]; then            STATIC=ON         ; fi
   - if [ -z "$OPENAL"            ]; then            OPENAL=OFF        ; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
       if [[ "$ARCH" == *-android ]]; then
@@ -81,7 +82,8 @@ before_install:
                                 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 -DSUPPORT_FILEFORMAT_FLAC=OFF'; fi;
+
         export RAYLIB_PACKAGE_SUFFIX="-Linux-$ARCH";
         if [ "$INSTALL_GLFW" == "YES" ]; then
           wget 'http://ftp.de.debian.org/debian/pool/main/g/glfw3/libglfw3_3.2.1-1_amd64.deb';
@@ -109,11 +111,12 @@ script:
     fi
   - $RUNNER cmake $CMAKE_ARCH_ARGS
       -DMACOS_FATLIB=ON
-      -DSTATIC=ON -DSHARED=$SHARED
+      -DSTATIC=$STATIC -DSHARED=$SHARED
       -DBUILD_EXAMPLES=ON -DBUILD_GAMES=ON
       -DUSE_EXTERNAL_GLFW=$USE_EXTERNAL_GLFW
       -DUSE_WAYLAND=$WAYLAND
       -DUSE_OPENAL_BACKEND=$OPENAL
+      -DINCLUDE_EVERYTHING=ON
       ..
   - $RUNNER make VERBOSE=1
   - if [ "$RELEASE" != "NO" ]; then $RUNNER make package; fi

+ 1 - 1
appveyor.yml

@@ -39,7 +39,7 @@ before_build:
   - cd build
 
 build_script:
-  - cmake -G %GENERATOR% -DSTATIC=ON -DSHARED=ON -DBUILD_EXAMPLES=%examples% -DBUILD_GAMES=%examples% ..
+  - cmake -G %GENERATOR% -DSTATIC=ON -DSHARED=ON -DBUILD_EXAMPLES=%examples% -DBUILD_GAMES=%examples% -DINCLUDE_EVERYTHING=ON ..
   - cmake --build . --target install
 
 after_build:

+ 12 - 9
src/CMakeOptions.txt

@@ -23,6 +23,9 @@ if(UNIX AND NOT APPLE)
   option(USE_WAYLAND "Use Wayland for window creation" OFF)
 endif()
 
+option(INCLUDE_EVERYTHING "Include everything disabled by default (for CI usage" OFF)
+set(OFF ${INCLUDE_EVERYTHING} CACHE INTERNAL "Replace any OFF by default with \${OFF} to have it covered by this option")
+
 
 # core.c
 option(SUPPORT_BUSY_WAIT_LOOP "Use busy wait loop for timing sync instead of a high-resolution timer" ON)
@@ -48,13 +51,13 @@ option(SUPPORT_FILEFORMAT_DDS "Support loading DDS as textures" ON)
 option(SUPPORT_FILEFORMAT_HDR "Support loading HDR as textures" ON)
 option(SUPPORT_FILEFORMAT_KTX "Support loading KTX as textures" ON)
 option(SUPPORT_FILEFORMAT_ASTC "Support loading ASTC as textures" ON)
-option(SUPPORT_FILEFORMAT_BMP "Support loading BMP as textures" OFF)
-option(SUPPORT_FILEFORMAT_TGA "Support loading TGA as textures" OFF)
-option(SUPPORT_FILEFORMAT_JPG "Support loading JPG as textures" OFF)
-option(SUPPORT_FILEFORMAT_GIF "Support loading GIF as textures" OFF)
-option(SUPPORT_FILEFORMAT_PSD "Support loading PSD as textures" OFF)
-option(SUPPORT_FILEFORMAT_PKM "Support loading PKM as textures" OFF)
-option(SUPPORT_FILEFORMAT_PVR "Support loading PVR as textures" OFF)
+option(SUPPORT_FILEFORMAT_BMP "Support loading BMP as textures" ${OFF})
+option(SUPPORT_FILEFORMAT_TGA "Support loading TGA as textures" ${OFF})
+option(SUPPORT_FILEFORMAT_JPG "Support loading JPG as textures" ${OFF})
+option(SUPPORT_FILEFORMAT_GIF "Support loading GIF as textures" ${OFF})
+option(SUPPORT_FILEFORMAT_PSD "Support loading PSD as textures" ${OFF})
+option(SUPPORT_FILEFORMAT_PKM "Support loading PKM as textures" ${OFF})
+option(SUPPORT_FILEFORMAT_PVR "Support loading PVR as textures" ${OFF})
 
 # models.c
 option(SUPPORT_FILEFORMAT_OBJ "Support loading OBJ file format" ON)
@@ -66,11 +69,11 @@ option(SUPPORT_FILEFORMAT_WAV  "Support loading WAV 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_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
 option(SUPPORT_SAVE_PNG "Support saving image data in PNG file format" ON)
-option(SUPPORT_SAVE_BMP "Support saving image data in BMP file format" OFF)
+option(SUPPORT_SAVE_BMP "Support saving image data in BMP file format" ${OFF})
 option(SUPPORT_TRACELOG "Show TraceLog() output messages. NOTE: By default LOG_DEBUG traces not shown" ON)
 
 option(SUPPORT_FILEFORMAT_FNT "Support loading fonts in FNT format" ON)