diff options
| -rwxr-xr-x | .travis-deps.sh | 4 | ||||
| -rwxr-xr-x | .travis-upload.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
4 files changed, 3 insertions, 6 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/.travis-upload.sh b/.travis-upload.sh index 1bec74b3d..2eeda4c50 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh @@ -14,7 +14,6 @@ if [ "$TRAVIS_EVENT_TYPE" = "push" ]&&[ "$TRAVIS_BRANCH" = "master" ]; then UPLOAD_DIR="/citra/nightly/osx-amd64" mkdir "$REV_NAME" - brew install lftp cp build/src/citra/Release/citra "$REV_NAME" cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME" @@ -122,5 +121,4 @@ EOL ARCHIVE_NAME="${REV_NAME}.tar.xz" tar -cJvf "$ARCHIVE_NAME" "$REV_NAME" - lftp -c "open -u citra-builds,$BUILD_PASSWORD sftp://builds.citra-emu.org; set sftp:auto-confirm yes; put -O '$UPLOAD_DIR' '$ARCHIVE_NAME'" fi diff --git a/.travis.yml b/.travis.yml index ea99be2c4..a9e7aadd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ addons: - libqt5opengl5-dev - xorg-dev - lib32stdc++6 # For CMake - - lftp # To upload builds - clang-format-4.0 cache: 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() |