citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-23 16:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2208 from freiro/libsdl205

Browse source 
Windows, move to SDL2-2.0.5
This commit is contained in:
Yuri Kunde Schlesner 2016-11-24 14:04:00 -08:00 committed by GitHub
parent 82210ab480 9ca3a2d461
commit 34d491295c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis-deps.sh
View file

@ -19,8 +19,8 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
if [ ! -e $HOME/.local/lib/libSDL2.la ]; then if [ ! -e $HOME/.local/lib/libSDL2.la ]; then
echo "SDL2 not found in cache, get and build it..." echo "SDL2 not found in cache, get and build it..."
wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz wget http://libsdl.org/release/SDL2-2.0.5.tar.gz -O - | tar xz
cd SDL2-2.0.4 cd SDL2-2.0.5
./configure --prefix=$HOME/.local ./configure --prefix=$HOME/.local
make -j4 && make install make -j4 && make install
else else

2
CMakeLists.txt
View file

@ -156,7 +156,7 @@ if (ENABLE_SDL2)
if (CITRA_USE_BUNDLED_SDL2) if (CITRA_USE_BUNDLED_SDL2)
# Detect toolchain and platform # Detect toolchain and platform
if (MSVC14 AND ARCHITECTURE_x86_64) if (MSVC14 AND ARCHITECTURE_x86_64)
set(SDL2_VER "SDL2-2.0.4") set(SDL2_VER "SDL2-2.0.5")
else() else()
message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRA_USE_BUNDLED_SDL2 and provide your own.") message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRA_USE_BUNDLED_SDL2 and provide your own.")
endif() endif()