Browse Source

Fix CI builds after mini_al changes

pull/417/head
Ahmad Fatoum 7 years ago
parent
commit
de78fa69bc
5 changed files with 5 additions and 8 deletions
  1. +1
    -1
      .travis.yml
  2. +0
    -3
      appveyor.yml
  3. +1
    -2
      src/CMakeLists.txt
  4. +3
    -1
      src/external/mini_al.h
  5. +0
    -1
      utils.cmake

+ 1
- 1
.travis.yml View File

@ -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;

+ 0
- 3
appveyor.yml View File

@ -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"

+ 1
- 2
src/CMakeLists.txt View File

@ -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?

+ 3
- 1
src/external/mini_al.h View File

@ -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 l">mal_backend_coreaudio:
{
// TODO: Implement me.
} break;
#endif
#endif
#ifdef MAL_HAS_OSS
case mal_backend_oss:
{

+ 0
- 1
utils.cmake View File

@ -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()

Loading…
Cancel
Save