mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-04 05:55:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't include alext.h when using Apple-provided OpenAL

Browse source
This commit is contained in:
Inori 2019-07-31 10:00:06 -04:00
parent cc983a2333
commit 6af4dcd407
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eventthread.cpp
View file

@ -31,7 +31,9 @@
#include <al.h> #include <al.h>
#include <alc.h> #include <alc.h>
#ifndef USE_MAC_OPENAL
#include <alext.h> #include <alext.h>
#endif
#include "sharedstate.h" #include "sharedstate.h"
#include "graphics.h" #include "graphics.h"

6
src/meson.build
View file

@ -15,6 +15,10 @@ main_dependencies = [sigcxx, openal, boost, zlib, pixman, physfs, vorbisfile, sd
if host_system == 'darwin' if host_system == 'darwin'
main_dependencies += meson.get_compiler('cpp').find_library('iconv') main_dependencies += meson.get_compiler('cpp').find_library('iconv')
if openal.type_name() != 'pkgconfig'
add_project_arguments('-DUSE_MAC_OPENAL', language: 'cpp')
endif
endif endif
if get_option('shared_fluid') == true if get_option('shared_fluid') == true
@ -132,4 +136,4 @@ main_source = files(
'fluid-fun.cpp' 'fluid-fun.cpp'
) )
main = [main_source, main_headers] main = [main_source, main_headers]