Make portaudio the default driver for non-Windows system, update deps

This commit is contained in:
Lior Halphon 2020-04-27 23:18:36 +03:00
parent a17d971fc0
commit c4ec9e51d1
3 changed files with 11 additions and 6 deletions

View File

@ -1,7 +1,7 @@
case `echo $1 | cut -d '-' -f 1` in case `echo $1 | cut -d '-' -f 1` in
ubuntu) ubuntu)
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get install -yq bison libpng-dev pkg-config libsdl2-dev sudo apt-get install -yq bison libpng-dev pkg-config libsdl2-dev portaudio19-dev
( (
cd `mktemp -d` cd `mktemp -d`
curl -L https://github.com/rednex/rgbds/archive/v0.4.0.zip > rgbds.zip curl -L https://github.com/rednex/rgbds/archive/v0.4.0.zip > rgbds.zip
@ -14,7 +14,7 @@ case `echo $1 | cut -d '-' -f 1` in
) )
;; ;;
macos) macos)
brew install rgbds sdl2 brew install rgbds sdl2 portaudio
;; ;;
*) *)
echo "Unsupported OS" echo "Unsupported OS"

View File

@ -37,7 +37,12 @@ endif
VERSION := 0.12.3 VERSION := 0.12.3
export VERSION export VERSION
CONF ?= debug CONF ?= debug
ifeq ($(PLATFORM),windows32)
SDL_AUDIO_DRIVER ?= sdl SDL_AUDIO_DRIVER ?= sdl
else
SDL_AUDIO_DRIVER ?= portaudio
endif
BIN := build/bin BIN := build/bin
OBJ := build/obj OBJ := build/obj

View File

@ -37,8 +37,8 @@ SameBoy passes all of [blargg's test ROMs](http://gbdev.gg8.se/wiki/articles/Tes
SameBoy requires the following tools and libraries to build: SameBoy requires the following tools and libraries to build:
* clang * clang
* make * make
* Cocoa port: OS X SDK and Xcode command line tools * Cocoa frontend: OS X SDK and Xcode command line tools
* SDL port: libsdl2 * SDL frontend: libsdl2, portaudio (Optional but recommended, set `SDL_AUDIO_DRIVER` to `sdl` to avoid)
* [rgbds](https://github.com/bentley/rgbds/releases/), for boot ROM compilation * [rgbds](https://github.com/bentley/rgbds/releases/), for boot ROM compilation
On Windows, SameBoy also requires: On Windows, SameBoy also requires:
@ -46,8 +46,8 @@ On Windows, SameBoy also requires:
* [GnuWin](http://gnuwin32.sourceforge.net/) * [GnuWin](http://gnuwin32.sourceforge.net/)
* Running vcvars32 before running make. Make sure all required tools and libraries are in %PATH% and %lib%, respectively. * Running vcvars32 before running make. Make sure all required tools and libraries are in %PATH% and %lib%, respectively.
To compile, simply run `make`. The targets are `cocoa` (Default for macOS), `sdl` (Default for everything else), `libretro`, `bootroms` and `tester`. You may also specify `CONF=debug` (default), `CONF=release` or `CONF=native_release` to control optimization and symbols. `native_release` is faster than `release`, but is optimized to the host's CPU and therefore is not portable. You may set `BOOTROMS_DIR=...` to a directory containing precompiled `dmg_boot.bin` and `cgb_boot.bin` files, otherwise the build system will compile and use SameBoy's own boot ROMs. To compile, simply run `make`. The targets are `cocoa` (Default for macOS), `sdl` (Default for everything else), `libretro`, `bootroms` and `tester`. You may also specify `CONF=debug` (default), `CONF=release` or `CONF=native_release` to control optimization and symbols. `native_release` is faster than `release`, but is optimized to the host's CPU and therefore is not portable. You may set `BOOTROMS_DIR=...` to a directory containing precompiled `dmg_boot.bin` and `cgb_boot.bin` files, otherwise the build system will compile and use SameBoy's own boot ROMs. When compiling the SDL frontend, `SDL_AUDIO_DRIVER` can be set to either `sdl` or `portaudio`; the default driver is `sdl` for Windows and `portaudio` for every other platform.
By default, the SDL port will look for resource files with a path relative to executable. If you are packaging SameBoy, you may wish to override this by setting the `DATA_DIR` variable during compilation to the target path of the directory containing all files (apart from the executable, that's not necessary) from the `build/bin/SDL` directory in the source tree. Make sure the variable ends with a `/` character. By default, the SDL frontend will look for resource files with a path relative to executable. If you are packaging SameBoy, you may wish to override this by setting the `DATA_DIR` variable during compilation to the target path of the directory containing all files (apart from the executable, that's not necessary) from the `build/bin/SDL` directory in the source tree. Make sure the variable ends with a `/` character.
SameBoy was compiled and tested on macOS, Ubuntu and 32-bit Windows 7. SameBoy was compiled and tested on macOS, Ubuntu and 32-bit Windows 7.