From def55943ed34978c18554ccafe984112a216241e Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 25 Oct 2015 10:18:21 +0100 Subject: [PATCH] Activated building SDL2 directly from submodule on Unix as well --- .travis.yml | 3 --- CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 350076d22..4ee8887fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,9 +39,6 @@ before_install: fi # Building for SDL here - if [ "$BUILD_SDL" == "YES" ]; then - curl -O https://www.libsdl.org/release/SDL2-2.0.3.tar.gz && - tar -xzvf SDL2-2.0.3.tar.gz && - mv SDL2-2.0.3 thirdparty/SDL2 && export SDL2DIR="$TRAVIS_BUILD_DIR/thirdparty/SDL2"; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index e39b31ed1..a69ac68ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ WAGIC_OPTION(BUILD_PNG "build png from source" (WIN32 OR APPLE OR PSP OR WAGIC_OPTION(BUILD_UNZIP "build unzip from source" ON) WAGIC_OPTION(BUILD_TINYXML "build tinyxml from source" (WIN32 OR APPLE OR PSP OR ANDROID OR EMSCRIPTEN)) WAGIC_OPTION(BUILD_ZIPFS "build zipfs from source" ON) -WAGIC_OPTION(BUILD_SDL2 "build SDL2 from source" (backend_sdl AND (WIN32 OR ANDROID OR EMSCRIPTEN))) +WAGIC_OPTION(BUILD_SDL2 "build SDL2 from source" (backend_sdl AND (UNIX OR WIN32 OR ANDROID OR EMSCRIPTEN))) #project options if(ANDROID)