UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CI builds after mini_al changes

Browse source
This commit is contained in:
Ahmad Fatoum 2017-12-06 22:18:14 +01:00
parent 203b2f65d1
commit de78fa69bc
5 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -23,7 +23,7 @@ before_script:
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
sudo apt-get install -y gcc-multilib sudo apt-get install -y gcc-multilib
libopenal-dev libasound2-dev
libxcursor-dev libxinerama-dev libxcursor-dev libxinerama-dev
mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev
libgl1-mesa-dev libglu1-mesa-dev libglew-dev; libgl1-mesa-dev libglu1-mesa-dev libglew-dev;

3
appveyor.yml
View file

@ -28,9 +28,6 @@ environment:
bits: 64 bits: 64
before_build: 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%]==[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%]==[32] set GENERATOR="Visual Studio 14 2015"
- if [%COMPILER%]==[msvc15] if [%BITS%]==[64] set GENERATOR="Visual Studio 14 2015 Win64" - if [%COMPILER%]==[msvc15] if [%BITS%]==[64] set GENERATOR="Visual Studio 14 2015 Win64"

3
src/CMakeLists.txt
View file

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

4
src/external/mini_al.h vendored
View file

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

1
utils.cmake
View file

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