diff options
| author | Eugene Sandulenko | 2016-08-15 10:19:38 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-15 16:07:28 +0200 |
| commit | de04a68c06b3837678abecc245960530c536afda (patch) | |
| tree | 2724501bb744bdec61ece900f51352fb26683b05 | |
| parent | 3dfd4ba296f407cec7533afee941be42ca5f61f1 (diff) | |
| download | scummvm-rg350-de04a68c06b3837678abecc245960530c536afda.tar.gz scummvm-rg350-de04a68c06b3837678abecc245960530c536afda.tar.bz2 scummvm-rg350-de04a68c06b3837678abecc245960530c536afda.zip | |
BUILD: Switch SDL backend to SDL2 by default. SDL1 is still a fallback.
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | dists/debian/control | 2 | ||||
| -rw-r--r-- | snapcraft.yaml | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 0c88ec8f24..0ec65ee859 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: - cpp -sudo: false +sudo: required addons: apt: packages: - g++ make - - libsdl1.2-dev - - libjpeg62-turbo-dev + - libsdl2-dev + - libjpeg-turbo8-dev - libmpeg2-4-dev - libogg-dev - libvorbis-dev @@ -32,6 +32,8 @@ compiler: os: - linux +dist: trusty + script: - ./configure --enable-all-engines - make -j 2 @@ -9,6 +9,7 @@ For a more comprehensive changelog of the latest experimental code, see: General: - Fixed audio corruption in the MS ADPCM decoder. + - Switched SDL backend to SDL2 by default. SDL1 is still a fallback. AGI: - Added support for Hercules rendering. Both green and amber modes are @@ -184,7 +184,7 @@ _amigaospath="Games:ScummVM" _staticlibpath= _xcodetoolspath= _sparklepath= -_sdlconfig=sdl-config +_sdlconfig=sdl2-config _freetypeconfig=freetype-config _sdlpath="$PATH" _freetypepath="$PATH" @@ -368,7 +368,7 @@ define_in_config_if_yes() { # TODO: small bit of code to test sdl usability find_sdlconfig() { echo_n "Looking for sdl-config... " - sdlconfigs="$SDL_CONFIG:$_sdlconfig:sdl-config:sdl11-config:sdl12-config" + sdlconfigs="$SDL_CONFIG:$_sdlconfig:sdl2-config:sdl12-config:sdl11-config:sdl-config" _sdlconfig= IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR" @@ -3122,7 +3122,7 @@ case $_backend in append_var INCLUDES "-I$ANDROID_NDK/sources/cxx-stl/system/include" ;; androidsdl) - ;; + ;; dc) append_var INCLUDES '-I$(srcdir)/backends/platform/dc' append_var INCLUDES '-isystem $(ronindir)/include' diff --git a/dists/debian/control b/dists/debian/control index 40c0e53470..f101ce3ef8 100644 --- a/dists/debian/control +++ b/dists/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org> Uploaders: David Weinehall <tao@debian.org>, Moritz Muehlenhoff <jmm@debian.org> -Build-Depends: debhelper (>= 7.0.50~), nasm [i386], libsdl1.2-dev, libmad0-dev, libasound2-dev [linux-any], libvorbis-dev, libmpeg2-4-dev, libflac-dev, libz-dev, libfluidsynth-dev, python +Build-Depends: debhelper (>= 7.0.50~), nasm [i386], libsdl2-dev, libmad0-dev, libasound2-dev [linux-any], libvorbis-dev, libmpeg2-4-dev, libflac-dev, libz-dev, libfluidsynth-dev, python Standards-Version: 3.9.2 Homepage: http://www.scummvm.org diff --git a/snapcraft.yaml b/snapcraft.yaml index 06afc769c5..178a323414 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -25,7 +25,7 @@ parts: build-packages: - g++ - make - - libsdl1.2-dev + - libsdl2-dev - libjpeg62-dev - libmpeg2-4-dev - libogg-dev @@ -54,7 +54,7 @@ parts: - libmpeg2-4 - libogg0 - libpng12-0 - - libsdl1.2debian + - libsdl2-2.0-0 - libsndio6.1 - libstdc++6 - libtheora0 |