diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-11-24 14:04:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 14:04:00 -0800 |
| commit | 34d491295c44b679b715deb4de4bc8f6bb0354cf (patch) | |
| tree | d7675b51e7ca674d1db38f43667571ef5e9c38f7 | |
| parent | 82210ab480c1e508de69722b7391ed2916ae2fe5 (diff) | |
| parent | 9ca3a2d4613eca038561512f2e117640134e46dd (diff) | |
Merge pull request #2208 from freiro/libsdl205
Windows, move to SDL2-2.0.5
| -rwxr-xr-x | .travis-deps.sh | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index ab3a32382..9fd21cc57 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -19,8 +19,8 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then if [ ! -e $HOME/.local/lib/libSDL2.la ]; then echo "SDL2 not found in cache, get and build it..." - wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz - cd SDL2-2.0.4 + wget http://libsdl.org/release/SDL2-2.0.5.tar.gz -O - | tar xz + cd SDL2-2.0.5 ./configure --prefix=$HOME/.local make -j4 && make install else diff --git a/CMakeLists.txt b/CMakeLists.txt index 56503f1ad..5c9b7f86a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,7 +156,7 @@ if (ENABLE_SDL2) if (CITRA_USE_BUNDLED_SDL2) # Detect toolchain and platform if (MSVC14 AND ARCHITECTURE_x86_64) - set(SDL2_VER "SDL2-2.0.4") + set(SDL2_VER "SDL2-2.0.5") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRA_USE_BUNDLED_SDL2 and provide your own.") endif() |