From bcc7bf326c7f5443aff7576afeec04b794592f9e Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Fri, 20 Dec 2019 04:02:29 +0100 Subject: [PATCH] Update README.md with SDL2 information --- README.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 8921020a..13b9d317 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,13 @@ Read more at | **Static analysis** | Yes[2],[3] | No | **Dynamic analysis** | Yes | No | **Automated regression tests** | No (planned)[4] | No -| **SDL** | 1.2 (2.0 WIP)[5] | 1.2 +| **SDL** | 2.0 | 1.2 [SVN]:https://sourceforge.net/projects/dosbox/ [1]:https://sourceforge.net/p/dosbox/patches/283/ [2]:https://github.com/dreamer/dosbox-staging/actions?query=workflow%3A%22Code+analysis%22 [3]:https://scan.coverity.com/projects/dosbox-staging [4]:https://github.com/dreamer/dosbox-staging/issues/23 -[5]:https://github.com/dreamer/dosbox-staging/issues/29 Codecs supported for CD Digital Audio emulation (loading CD music via [cue sheets](https://en.wikipedia.org/wiki/Cue_sheet_(computing))): @@ -35,19 +34,19 @@ Codecs supported for CD Digital Audio emulation (loading CD music via | | dosbox-staging | DOSBox |- |- |- | **Opus** | Yes (libopus) | No -| **OGG/Vorbis** | Yes (built-in) | Yes - SDL\_sound 1.2 (libvorbis)[6],* -| **MP3** | Yes (built-in) | Yes - SDL\_sound 1.2 (libmpg123)[6],*,§ +| **OGG/Vorbis** | Yes (built-in) | Yes - SDL\_sound 1.2 (libvorbis)[5],* +| **MP3** | Yes (built-in) | Yes - SDL\_sound 1.2 (libmpg123)[5],*,§ | **FLAC** | Yes (built-in) | No§ -| **WAV** | Yes (built-in) | Yes - SDL\_sound 1.2 (internal)[7],* -| **AIFF** | No | Yes - SDL\_sound 1.2 (internal)[7],* +| **WAV** | Yes (built-in) | Yes - SDL\_sound 1.2 (internal)[6],* +| **AIFF** | No | Yes - SDL\_sound 1.2 (internal)[6],* * - SDL 1.2 is not actively maintained any more. † - 22.05 kHz, 44.1 kHz, 48 kHz; mono, stereo ‡ - 44.1 kHz stereo only § - SDL\_sound supports it, but the feature might be broken or DOSBox does not indicate support. -[6]:https://www.dosbox.com/wiki/MOUNT#Mounting_a_CUE.2FBIN-Pair_as_volume -[7]:https://sourceforge.net/p/dosbox/code-0/HEAD/tree/dosbox/trunk/src/dos/cdrom_image.cpp#l536 +[5]:https://www.dosbox.com/wiki/MOUNT#Mounting_a_CUE.2FBIN-Pair_as_volume +[6]:https://sourceforge.net/p/dosbox/code-0/HEAD/tree/dosbox/trunk/src/dos/cdrom_image.cpp#l536 ## Development snapshot builds @@ -67,15 +66,15 @@ be necessary for specific snapshots (check included README file). #### Fedora - $ sudo dnf install SDL SDL_net opusfile + $ sudo dnf install SDL2 SDL2_net opusfile #### Debian, Ubuntu - $ sudo apt install libsdl1.2 sdl-net1.2 opusfile + $ sudo apt install libsdl2-2.0 libsdl2-net-2.0 opusfile #### Arch, Manjaro - $ sudo pacman -S sdl sdl_net opusfile + $ sudo pacman -S sdl2 sdl2_net opusfile ## [Windows](https://github.com/dreamer/dosbox-staging/actions?query=workflow%3A%22Windows+builds%22+is%3Asuccess) @@ -121,7 +120,7 @@ install build dependencies. Once vcpkg is installed and bootstrapped, open PowerShell, and run: PS> .\vcpkg integrate install - PS> .\vcpkg install libpng sdl1 sdl1-net opusfile + PS> .\vcpkg install libpng sdl2 sdl2-net opusfile These two steps will ensure that MSVC finds and links all dependencies.