Merge pull request #294 from gunnbr/master

Switched to build OpenAL from source for Android

legacy/dependencies/extension-api/src/org/haxe/lime/Lime.java

@@ -5,7 +5,6 @@ package org.haxe.lime;
 public class Lime {
 
      static {
-         System.loadLibrary("openal");
          System.loadLibrary("lime");
      }
 

legacy/include.xml

@@ -8,8 +8,6 @@
 		<ndll name="regexp" haxelib="hxcpp" if="cpp" />
 		<ndll name="zlib" haxelib="hxcpp" if="cpp" unless="ios" />
 		
-		<ndll name="openal" dir="legacy/ndll" register="false" if="android" />
-		
 		<ndll name="lime" dir="legacy/ndll" />
 		
 		<ndll name="libfreetype" dir="legacy/ndll" register="false" if="emscripten" />
@@ -32,4 +30,4 @@
 	
 	<templatePath name="templates" />
 	
-</extension>
+</extension>

legacy/project/Build.xml

@@ -6,7 +6,8 @@
 	<set name="debug" value="debug" if="fulldebug" />
 	
 	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
-	
+	<include name="lib/openal-android/files.xml" if="android" />
+
 	<set name="LEGACY_SDL1" value="1" if="rpi" />
 	<set name="LEGACY_SDL1" value="1" if="blackberry" />
 	<set name="LEGACY_SDL1" value="1" if="webos" />
@@ -270,6 +271,7 @@
 		<files id="native-toolkit-freetype" />
 		<files id="native-toolkit-ogg" if="LEGACY_OPENAL" />
 		<files id="native-toolkit-openal" if="LEGACY_OPENAL" unless="android || ios || blackberry || tizen" />
+		<files id="native-toolkit-openal-android" if="android" />
 		<files id="native-toolkit-png" />
 		<files id="native-toolkit-sdl" if="LEGACY_SDL2" />
 		<files id="native-toolkit-vorbis" if="LEGACY_OPENAL" />
@@ -412,8 +414,6 @@
 			<section if="android">
 				
 				<lib name="-L../legacy/ndll/Android" if="LEGACY_OPENAL" />
-				<lib name="-lopenal" if="LEGACY_OPENAL" unless="HXCPP_X86"/>
-				<lib name="-lopenal-x86" if="LEGACY_OPENAL HXCPP_X86" />
 				<lib name="-ldl" />
 				<lib name="-landroid" />
 				<lib name="-lGLESv2" />
@@ -474,4 +474,4 @@
 		
 	</target>
 	
-</xml>
+</xml>

legacy/project/src/openal/OpenALSound.cpp

@@ -825,7 +825,7 @@ namespace nme
       alcSuspendContext(sgContext);
       
       #ifdef ANDROID
-      alcSuspend();
+      alcandroid_Suspend();
       #endif
    }
    
@@ -837,7 +837,7 @@ namespace nme
          return;
       
       #ifdef ANDROID
-      alcResume();
+      alcandroid_Resume();
       #endif
       
       alcMakeContextCurrent(sgContext);

legacy/project/src/openal/OpenALSound.h

@@ -21,8 +21,8 @@ typedef struct {
 AndroidOpenALFuncs androidOpenALFuncs;
 
 extern "C" {
-  ALC_API void       ALC_APIENTRY alcSuspend(void);
-  ALC_API void       ALC_APIENTRY alcResume(void);
+  ALC_API void       ALC_APIENTRY alcandroid_Suspend(void);
+  ALC_API void       ALC_APIENTRY alcandroid_Resume(void);
 }
 
 #include <ByteArray.h>