Merge pull request kivy#2 from Kr0n0/master

FIX - sdl2_jnienv_getter.patch - Darwin code changes in pyjnius setup.py @Kr0n0 Thanks for your contribution!
lazyyq · Nov 7, 2018 · 868d1f8 · 868d1f8
2 parents a4e1d28 + d386848
commit 868d1f8
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pythonforandroid/recipes/pyjnius/sdl2_jnienv_getter.patch b/pythonforandroid/recipes/pyjnius/sdl2_jnienv_getter.patch
@@ -14,12 +14,12 @@ 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':
+@@ -97,7 +97,7 @@
+
+ if PLATFORM == 'android':
      # for android, we use SDL...
--    libraries = ['sdl', 'log']
-+    libraries = ['SDL2', 'log']
-     library_dirs = ['libs/' + getenv('ARCH')]
- elif platform == 'darwin':
-     import subprocess
+-    LIBRARIES = ['sdl', 'log']
++    LIBRARIES = ['SDL2', 'log']
+     LIBRARY_DIRS = ['libs/' + getenv('ARCH')]
+ elif PLATFORM == 'darwin':
+     FRAMEWORK = subprocess.Popen(