diff options
| -rw-r--r-- | indra/llaudio/lllistener_openal.h | 4 | ||||
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 6 | ||||
| -rw-r--r-- | indra/newview/FixPackage.cmake.in | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/indra/llaudio/lllistener_openal.h b/indra/llaudio/lllistener_openal.h index f1b69ddcef..e4d7e67422 100644 --- a/indra/llaudio/lllistener_openal.h +++ b/indra/llaudio/lllistener_openal.h @@ -31,7 +31,11 @@ #include "lllistener.h" #include "AL/al.h" +#ifdef __APPLE__ +#undef __APPLE__ #include "AL/alut.h" +#define __APPLE__ +#endif #include "AL/alext.h" class LLListener_OpenAL : public LLListener diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 63041fb603..48e0024993 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -235,9 +235,9 @@ execute_process( COMMAND lipo libogg.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libogg.0.dylib - COMMAND lipo libopenal.1.23.1.dylib + COMMAND lipo libopenal.1.24.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.23.1.dylib + -output libopenal.1.24.1.dylib COMMAND lipo libpcre.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpcre.1.dylib @@ -310,7 +310,7 @@ execute_process( Frameworks/libndofdev.dylib Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib - Frameworks/libopenal.1.23.1.dylib + Frameworks/libopenal.1.24.1.dylib Frameworks/libpcre.1.dylib Frameworks/libpcrecpp.0.dylib Frameworks/libpng16.16.dylib diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in index 5f9ba28fc0..e1f8e648a5 100644 --- a/indra/newview/FixPackage.cmake.in +++ b/indra/newview/FixPackage.cmake.in @@ -235,9 +235,9 @@ execute_process( COMMAND lipo libogg.0.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libogg.0.dylib - COMMAND lipo libopenal.1.23.1.dylib + COMMAND lipo libopenal.1.24.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenal.1.23.1.dylib + -output libopenal.1.24.1.dylib COMMAND lipo libpcre.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpcre.1.dylib @@ -310,7 +310,7 @@ execute_process( Frameworks/libndofdev.dylib Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib - Frameworks/libopenal.1.23.1.dylib + Frameworks/libopenal.1.24.1.dylib Frameworks/libpcre.1.dylib Frameworks/libpcrecpp.0.dylib Frameworks/libpng16.16.dylib |