[Build] Remove lingering references to OpenAl

OpenAl is now required to build.

README.md

@@ -217,7 +217,6 @@ Here is the complete list:
 | ENABLE_GBA_LOGGING    | Enable extended GBA logging                                          | ON                    |
 | ENABLE_DIRECT3D       | Direct3D rendering for wxWidgets (Windows, **NOT IMPLEMENTED!!!**)   | ON                    |
 | ENABLE_XAUDIO2        | Enable xaudio2 sound output for wxWidgets (Windows only)             | ON                    |
-| ENABLE_OPENAL         | Enable OpenAL for the wxWidgets port                                 | AUTO                  |
 | ENABLE_ASAN           | Enable libasan sanitizers (by default address, only in debug mode)   | OFF                   |
 | UPSTREAM_RELEASE      | Do some release tasks, like codesigning, making zip and gpg sigs.    | OFF                   |
 | BUILD_TESTING         | Build the tests and enable ctest support.                            | ON                    |

doc/DevInfo.txt

@@ -13,7 +13,6 @@ Known preprocessor switches:
 - RGB555: Use 16bit colors with 5bit green instead of 6bit green in hq3x/4x filters (C++ version)
 - NO_OGL: Exclude OpenGL code
 - NO_D3D: Exclude Direct3D code
-- NO_OAL: Exclude OpenAL code
 - NO_XAUDIO2: Exclude XAudio2 code (the XAudio2 interface is DirectSound's successor)
 - NO_LINK: Exclude linking code (joybus, multilink, ...)
 - WIN64: This macro is only defined for 64 bit builds

installdeps

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 CMAKE=cmake
-ENABLE_OPENAL=1
 ENABLE_FFMPEG=1
 
 main() {
@@ -25,10 +24,6 @@ check_command_line_args() {
                 usage
                 quit 0
                 ;;
-            --no-openal)
-                ENABLE_OPENAL=
-                shift
-                ;;
             --no-ffmpeg)
                 ENABLE_FFMPEG=
                 shift
@@ -355,9 +350,8 @@ debian_installdeps() {
                 ;;
         esac
 
-        pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl2-dev $sdl_lib libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev libsfml-dev $sfml_libs $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build"
+        pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl2-dev $sdl_lib libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev libsfml-dev $sfml_libs $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build libopenal-dev"
 
-        [ -n "$ENABLE_OPENAL" ] && pkgs="$pkgs libopenal-dev"
         [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs libavcodec-dev libavformat-dev libswscale-dev libavutil-dev $libswresample_dev"
 
         check sudo apt-get -qy install $pkgs
@@ -407,8 +401,7 @@ debian_installdeps() {
             fi
         fi
 
-        deps="gcc zlib ffmpeg gettext sdl2 sfml openal wxwidgets"
+        deps="gcc zlib ffmpeg gettext sdl2 sfml openal wxwidgets openal"
-        [ -n "$ENABLE_OPENAL" ] && deps="$deps openal"
         [ -n "$ENABLE_FFMPEG" ] && deps="$deps ffmpeg"
 
         set --
@@ -510,9 +503,6 @@ fedora_installdeps() {
                 *ffmpeg*)
                     [ -z "$ENABLE_FFMPEG" ] && continue
                     ;;
-                *openal*)
-                    [ -z "$ENABLE_OPENAL" ] && continue
-                    ;;
             esac
 
             pkg_arch=
@@ -601,15 +591,9 @@ fedora_installdeps() {
                 ;;
         esac
         # install static deps
-        for pkg in zlib gettext SDL2 wxWidgets3; do
+        for pkg in zlib gettext SDL2 wxWidgets3 openal-soft; do
             set -- "$@" "${target}-${pkg}-static"
         done
-        # install deps that are not available as static
-        if [ -n "$ENABLE_OPENAL" ]; then
-            for pkg in openal-soft; do
-                set -- "$@" "${target}-${pkg}"
-            done
-        fi
 
         # get the necessary win32 headers
         git submodule update --init --remote --recursive
@@ -707,9 +691,6 @@ rhel_installdeps() {
                 *ffmpeg*)
                     [ -z "$ENABLE_FFMPEG" ] && continue
                     ;;
-                *openal*)
-                    [ -z "$ENABLE_OPENAL" ] && continue
-                    ;;
             esac
 
             if [ -n "$amd64" ]; then
@@ -790,15 +771,9 @@ rhel_installdeps() {
                 ;;
         esac
         # install static deps
-        for pkg in zlib gettext SDL2 wxWidgets; do
+        for pkg in zlib gettext SDL2 wxWidgets openal-soft; do
             set -- "$@" "${target}-${pkg}-static"
         done
-        # install deps that are not available as static
-        if [ -n "$ENABLE_OPENAL" ]; then
-            for pkg in openal-soft; do
-                set -- "$@" "${target}-${pkg}"
-            done
-        fi
 
         # get the necessary win32 headers
         git submodule update --init --remote --recursive
@@ -824,9 +799,8 @@ suse_installdeps() {
 
     tools="make cmake ccache nasm gettext-tools pkg-config ccache zip sfml2-devel ninja"
 
-    libs="gcc gcc-c++ libSDL2-devel wxWidgets-3_0-devel" # ffmpeg-devel
+    libs="gcc gcc-c++ libSDL2-devel wxWidgets-3_0-devel openal-soft-devel" # ffmpeg-devel
 
-    [ -n "$ENABLE_OPENAL" ] && libs="$libs openal-soft-devel"
     # ffmpeg requires packman repos
 
     if [ "$target" = m32 ]; then
@@ -894,9 +868,8 @@ archlinux_installdeps() {
 
     $pacman -Q gtk3-classic >/dev/null 2>&1 && gtk=gtk3-classic
 
-    libs="zlib mesa gettext sdl2 wxgtk3 $gtk sfml"
+    libs="zlib mesa gettext sdl2 wxgtk3 $gtk sfml openal"
 
-    [ -n "$ENABLE_OPENAL" ] && libs="$libs openal"
     [ -n "$ENABLE_FFMPEG" ] && libs="$libs ffmpeg"
 
     if [ -z "$target" -o "$target" = m32 ]; then
@@ -991,9 +964,7 @@ EOF
           fi
         done
 
-        deps="zlib gettext pkg-config sdl2 wxmsw"
+        deps="zlib gettext pkg-config sdl2 wxmsw openal"
-
-        [ -n "$ENABLE_OPENAL" ] && deps="$deps openal"
 
         # and the actual deps
         for p in $deps; do
@@ -1024,9 +995,7 @@ solus_installdeps() {
     check sudo eopkg -y install -c system.devel
     check sudo eopkg -y install git ccache ninja
 
-    set -- sdl2-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel
+    set -- sdl2-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel openal-soft-devel
-
-    [ -n "$ENABLE_OPENAL" ] && set -- "$@" openal-soft-devel
 
     if [ -n "$amd64" -a "$target" = m32 ]; then
         info_msg 'Calculating dependencies, this will take a while..'
@@ -1102,14 +1071,13 @@ gentoo_installdeps() {
       sys-devel/binutils \
       media-libs/libsdl2 \
       media-libs/libsfml \
+      media-libs/openal \
       x11-libs/wxGTK:$wx_slot \
       sys-libs/zlib \
       dev-util/pkgconf \
       dev-lang/nasm \
       dev-build/ninja"
 
-    [ -n "$ENABLE_OPENAL" ] && ebuilds="$ebuilds media-libs/openal"
-
     [ -n "$ENABLE_FFMPEG" ] && ebuilds="$ebuilds media-video/ffmpeg"
 
     check sudo emerge -vna $ebuilds
@@ -1152,7 +1120,7 @@ windows_installdeps() {
             ;;
     esac
 
-    pkgs="$pkgs SDL2 sfml FAudio wxWidgets3.2 zlib binutils cmake crt-git headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache"
+    pkgs="$pkgs SDL2 sfml FAudio wxWidgets3.2 zlib binutils cmake crt-git headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache openal"
 
     case "$target" in
         *x86_64)
@@ -1160,7 +1128,6 @@ windows_installdeps() {
             ;;
     esac
 
-    [ -n "$ENABLE_OPENAL" ] && pkgs="$pkgs openal"
     [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"
 
     set --

snapcraft.yaml

@@ -51,7 +51,6 @@ parts:
       - libopenal-dev
       - libwxgtk3.0-gtk3-dev
     cmake-parameters:
-      - -DENABLE_OPENAL=ON
       - -DENABLE_SDL=OFF
       - -DCMAKE_INSTALL_PREFIX=/usr
 

src/wx/guiinit.cpp

@@ -1506,14 +1506,12 @@ public:
         switch (api) {
         case AUD_SDL:
             break;
-#ifndef NO_OAL
 
         case AUD_OPENAL:
             if (!GetOALDevices(names, dev_ids))
                 return false;
 
             break;
-#endif
 #ifdef __WXMSW__
 
         case AUD_DIRECTSOUND:
@@ -2700,9 +2698,6 @@ bool MainFrame::BindControls()
             rb->Hide(); // currently disabled
 
             audapi_rb("OpenAL", AUD_OPENAL);
-#ifdef NO_OAL
-            rb->Hide();
-#endif
             audapi_rb("DirectSound", AUD_DIRECTSOUND);
 #ifndef __WXMSW__
             rb->Hide();

src/wx/openal.cpp

@@ -1,8 +1,6 @@
 // === LOGALL writes very detailed informations to vba-trace.log ===
 //#define LOGALL
 
-#ifndef NO_OAL
-
 // for gopts
 // also, wx-related
 #include "wx/wxvbam.h"
@@ -363,5 +361,3 @@ bool OpenAL::GetDevices(wxArrayString& names, wxArrayString& ids)
     // should work anyway, but must always use default driver
     return true;
 }
-
-#endif

src/wx/sys.cpp

@@ -1233,11 +1233,9 @@ SoundDriver* systemSoundInit()
     switch (gopts.audio_api) {
     case AUD_SDL:
         return new SoundSDL();
-#ifndef NO_OAL
 
     case AUD_OPENAL:
         return newOpenAL();
-#endif
 #ifdef __WXMSW__
 
     case AUD_DIRECTSOUND:

src/wx/wxvbam.h

@@ -703,11 +703,9 @@ private:
 // I should add this to SoundDriver, but wxArrayString is wx-specific
 // I suppose I could make subclass wxSoundDriver.  maybe later.
 
-#ifndef NO_OAL
 class SoundDriver;
 extern SoundDriver* newOpenAL();
 extern bool GetOALDevices(wxArrayString& names, wxArrayString& ids);
-#endif
 
 #ifdef __WXMSW__
 extern SoundDriver* newDirectSound();

tools/builder/core.sh

@@ -524,7 +524,7 @@ setup() {
     # binary smaller.
     if [ "$target_os" = windows ] && [ "$target_bits" -eq 32 ]; then
         BUILD_FFMPEG=
-        PROJECT_ARGS="$PROJECT_ARGS -DENABLE_OPENAL=NO"
+        PROJECT_ARGS="$PROJECT_ARGS"
     fi
 
     if [ -z "$BUILD_FFMPEG" ]; then