8b2694efb7
* fix build for openssl 1.1.1b required for sdk (cherry picked from commit aa49e3b2755b97b6331cdbbb89efc954de8d5977) * use js code from master * fix openssl recipe and tweak build (cherry picked from commit 6e94c27021c7bd7b1e880c2fc314850e36a5a38e) * remove unused build recipes (cherry picked from commit f5c0577bdb175bfc0990602936bbc9e2052e1f25)
26 lines
796 B
Diff
26 lines
796 B
Diff
diff --git a/jnius/jnius_jvm_android.pxi b/jnius/jnius_jvm_android.pxi
|
|
index ac89fec..71daa43 100644
|
|
--- a/jnius/jnius_jvm_android.pxi
|
|
+++ b/jnius/jnius_jvm_android.pxi
|
|
@@ -1,5 +1,5 @@
|
|
# on android, rely on SDL to get the JNI env
|
|
-cdef extern JNIEnv *SDL_ANDROID_GetJNIEnv()
|
|
+cdef extern JNIEnv *SDL_AndroidGetJNIEnv()
|
|
|
|
cdef JNIEnv *get_platform_jnienv():
|
|
- return SDL_ANDROID_GetJNIEnv()
|
|
+ return <JNIEnv*>SDL_AndroidGetJNIEnv()
|
|
diff --git a/setup.py b/setup.py
|
|
index 740510f..0c8e55f 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -53,7 +53,7 @@ except ImportError:
|
|
|
|
if PLATFORM == 'android':
|
|
# for android, we use SDL...
|
|
- LIBRARIES = ['sdl', 'log']
|
|
+ LIBRARIES = ['SDL2', 'log']
|
|
LIBRARY_DIRS = ['libs/' + getenv('ARCH')]
|
|
elif PLATFORM == 'darwin':
|
|
import subprocess
|