thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUILD: Switch SDL backend to SDL2 by default. SDL1 is still a fallback.

Browse source
This commit is contained in:
Eugene Sandulenko 2016-08-15 10:19:38 +02:00
parent 3dfd4ba296
commit de04a68c06
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -1,14 +1,14 @@
language: language:
- cpp - cpp
sudo: false sudo: required
addons: addons:
apt: apt:
packages: packages:
- g++ make - g++ make
- libsdl1.2-dev - libsdl2-dev
- libjpeg62-turbo-dev - libjpeg-turbo8-dev
- libmpeg2-4-dev - libmpeg2-4-dev
- libogg-dev - libogg-dev
- libvorbis-dev - libvorbis-dev
@ -32,6 +32,8 @@ compiler:
os: os:
- linux - linux
dist: trusty
script: script:
- ./configure --enable-all-engines - ./configure --enable-all-engines
- make -j 2 - make -j 2

1
NEWS
View file

@ -9,6 +9,7 @@ For a more comprehensive changelog of the latest experimental code, see:
General: General:
- Fixed audio corruption in the MS ADPCM decoder. - Fixed audio corruption in the MS ADPCM decoder.
- Switched SDL backend to SDL2 by default. SDL1 is still a fallback.
AGI: AGI:
- Added support for Hercules rendering. Both green and amber modes are - Added support for Hercules rendering. Both green and amber modes are

6
configure vendored
View file

@ -184,7 +184,7 @@ _amigaospath="Games:ScummVM"
_staticlibpath= _staticlibpath=
_xcodetoolspath= _xcodetoolspath=
_sparklepath= _sparklepath=
_sdlconfig=sdl-config _sdlconfig=sdl2-config
_freetypeconfig=freetype-config _freetypeconfig=freetype-config
_sdlpath="$PATH" _sdlpath="$PATH"
_freetypepath="$PATH" _freetypepath="$PATH"
@ -368,7 +368,7 @@ define_in_config_if_yes() {
# TODO: small bit of code to test sdl usability # TODO: small bit of code to test sdl usability
find_sdlconfig() { find_sdlconfig() {
echo_n "Looking for sdl-config... " 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= _sdlconfig=
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR" 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" append_var INCLUDES "-I$ANDROID_NDK/sources/cxx-stl/system/include"
;; ;;
androidsdl) androidsdl)
;; ;;
dc) dc)
append_var INCLUDES '-I$(srcdir)/backends/platform/dc' append_var INCLUDES '-I$(srcdir)/backends/platform/dc'
append_var INCLUDES '-isystem $(ronindir)/include' append_var INCLUDES '-isystem $(ronindir)/include'

2
dists/debian/control
View file

@ -3,7 +3,7 @@ Section: games
Priority: optional Priority: optional
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org> Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: David Weinehall <tao@debian.org>, Moritz Muehlenhoff <jmm@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 Standards-Version: 3.9.2
Homepage: http://www.scummvm.org Homepage: http://www.scummvm.org

4
snapcraft.yaml
View file

@ -25,7 +25,7 @@ parts:
build-packages: build-packages:
- g++ - g++
- make - make
- libsdl1.2-dev - libsdl2-dev
- libjpeg62-dev - libjpeg62-dev
- libmpeg2-4-dev - libmpeg2-4-dev
- libogg-dev - libogg-dev
@ -54,7 +54,7 @@ parts:
- libmpeg2-4 - libmpeg2-4
- libogg0 - libogg0
- libpng12-0 - libpng12-0
- libsdl1.2debian - libsdl2-2.0-0
- libsndio6.1 - libsndio6.1
- libstdc++6 - libstdc++6
- libtheora0 - libtheora0