diff --git a/legacy/dependencies/extension-api/src/org/haxe/lime/Lime.java b/legacy/dependencies/extension-api/src/org/haxe/lime/Lime.java index d100957a2..58ef69006 100644 --- a/legacy/dependencies/extension-api/src/org/haxe/lime/Lime.java +++ b/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"); } diff --git a/legacy/include.xml b/legacy/include.xml index 1ab4c703e..0392408a3 100644 --- a/legacy/include.xml +++ b/legacy/include.xml @@ -8,8 +8,6 @@ - - @@ -32,4 +30,4 @@ - \ No newline at end of file + diff --git a/legacy/ndll/Android/libopenal-v7.so b/legacy/ndll/Android/libopenal-v7.so deleted file mode 100644 index 977bcf20c..000000000 Binary files a/legacy/ndll/Android/libopenal-v7.so and /dev/null differ diff --git a/legacy/ndll/Android/libopenal-x86.so b/legacy/ndll/Android/libopenal-x86.so deleted file mode 100755 index d4142348e..000000000 Binary files a/legacy/ndll/Android/libopenal-x86.so and /dev/null differ diff --git a/legacy/ndll/Android/libopenal.so b/legacy/ndll/Android/libopenal.so deleted file mode 100644 index bb3c9755f..000000000 Binary files a/legacy/ndll/Android/libopenal.so and /dev/null differ diff --git a/legacy/project/Build.xml b/legacy/project/Build.xml index 57d127dc6..bfa2e5787 100644 --- a/legacy/project/Build.xml +++ b/legacy/project/Build.xml @@ -6,7 +6,8 @@ - + + @@ -270,6 +271,7 @@ + @@ -412,8 +414,6 @@
- - @@ -474,4 +474,4 @@ - \ No newline at end of file + diff --git a/legacy/project/src/openal/OpenALSound.cpp b/legacy/project/src/openal/OpenALSound.cpp index b6f7cef10..e3f840a24 100644 --- a/legacy/project/src/openal/OpenALSound.cpp +++ b/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); diff --git a/legacy/project/src/openal/OpenALSound.h b/legacy/project/src/openal/OpenALSound.h index 1a687f445..d8048a0f8 100644 --- a/legacy/project/src/openal/OpenALSound.h +++ b/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