Use standard OpenALSoft on Android

This commit is contained in:
Joshua Granick
2016-09-09 14:10:07 -07:00
parent 2fdea8ff38
commit 86d998e129

View File

@@ -20,6 +20,7 @@
<set name="LIME_OGG" value="1" />
<set name="LIME_OPENAL" value="1" unless="static_link" />
<set name="LIME_OPENAL" value="1" if="iphone || android || emscripten || tvos" />
<set name="LIME_OPENALSOFT" value="1" if="LIME_OPENAL" unless="iphone || emscripten || tvos" />
<set name="LIME_OPENGL" value="1" />
<set name="LIME_PIXMAN" value="1" />
<set name="LIME_PNG" value="1" />
@@ -137,10 +138,12 @@
<section if="LIME_OPENAL">
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/include/" unless="android || emscripten" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal-android/include/" if="android" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/include/" unless="emscripten" />
<!-- <compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal-android/include/" if="android" /> -->
<compilerflag value="-DLIME_OPENAL" />
<compilerflag value="-DLIME_OPENALSOFT" if="LIME_OPENALSOFT" />
<compilerflag value="-DAL_LIBTYPE_STATIC=1" />
<compilerflag value="-DAL_ALEXT_PROTOTYPES" />
<file name="src/audio/openal/OpenALBindings.cpp" />
@@ -254,7 +257,7 @@
<include name="lib/nfd/files.xml" />
<include name="lib/ogg/files.xml" />
<include name="lib/openal/files.xml" />
<include name="lib/openal-android/files.xml" if="android" />
<!-- <include name="lib/openal-android/files.xml" if="android" /> -->
<include name="lib/pixman/files.xml" />
<include name="lib/png/files.xml" />
<include name="lib/sdl/files.xml" />
@@ -280,8 +283,8 @@
<files id="native-toolkit-neko" if="LIME_NEKO" />
<files id="native-toolkit-nfd" if="LIME_NFD" />
<files id="native-toolkit-ogg" if="LIME_OGG" />
<files id="native-toolkit-openal" if="LIME_OPENAL" unless="iphone || android || emscripten || tvos" />
<files id="native-toolkit-openal-android" if="LIME_OPENAL android" />
<files id="native-toolkit-openal" if="LIME_OPENALSOFT" />
<!-- <files id="native-toolkit-openal-android" if="LIME_OPENAL android" /> -->
<files id="native-toolkit-pixman" if="LIME_PIXMAN" />
<files id="native-toolkit-png" if="LIME_PNG" />
<files id="native-toolkit-sdl" if="LIME_SDL" unless="emscripten" />