From 3e5093eab0ef4949e9e08fda5de0cd3d31b7e2c1 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Fri, 27 Jul 2018 18:28:37 +0200 Subject: 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... --- src/CMakeOptions.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/CMakeOptions.txt b/src/CMakeOptions.txt index a9cd4354..5fab1cab 100644 --- a/src/CMakeOptions.txt +++ b/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) -- cgit v1.2.3