Fix CI builds after mini_al changes

a3f · Dec 10, 2017 · de78fa6 · de78fa6
1 parent 203b2f6
commit de78fa6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
 before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
       sudo apt-get install -y gcc-multilib
-                              libopenal-dev
+                              libasound2-dev
                               libxcursor-dev libxinerama-dev
                               mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev
                               libgl1-mesa-dev libglu1-mesa-dev libglew-dev;

diff --git a/appveyor.yml b/appveyor.yml
@@ -28,9 +28,6 @@ environment:
       bits: 64
 
 before_build:
-  - appveyor DownloadFile http://openal-soft.org/openal-binaries/openal-soft-1.17.2-bin.zip
-  - 7z x openal-soft-1.17.2-bin.zip
-  - move openal-soft-1.17.2-bin src\external\openal
   - if [%compiler%]==[mingw] set CFLAGS=-m%BITS% & set LDFLAGS=-m%BITS% & set GENERATOR="MinGW Makefiles"
   - if [%COMPILER%]==[msvc15] if [%BITS%]==[32] set GENERATOR="Visual Studio 14 2015"
   - if [%COMPILER%]==[msvc15] if [%BITS%]==[64] set GENERATOR="Visual Studio 14 2015 Win64"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -83,8 +83,7 @@ endif()
 # Get the sources together
 file(GLOB raylib_sources *.c)
 file(GLOB stb_vorbis external/stb_vorbis.c)
-file(GLOB mini_al external/mini_al.c)
-set(sources ${raylib_sources} ${stb_vorbis})
+file(GLOB mini_al external/mini_al.c ${stb_vorbis})
 set(sources ${raylib_sources} ${mini_al})
 
 # Which platform?

diff --git a/src/external/mini_al.h b/src/external/mini_al.h
@@ -2745,12 +2745,14 @@ static mal_result mal_context__try_get_device_name_by_id(mal_context* pContext,
                 }
             } break;
         #endif
+        #if 0
         #ifdef MAL_HAS_COREAUDIO
-            case mal_backend_coreaudio
+            case mal_backend_coreaudio:
             {
                 // TODO: Implement me.
             } break;
         #endif
+        #endif
         #ifdef MAL_HAS_OSS
             case mal_backend_oss:
             {

diff --git a/utils.cmake b/utils.cmake
@@ -23,7 +23,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
   # Elsewhere (such as Linux), need `-lopenal -lGL`, etc...
   set(LIBS_PRIVATE
       m pthread dl
-      openal
       GL
       X11 Xrandr Xinerama Xi Xxf86vm Xcursor)  # X11 stuff
 endif()