From 8f904f7e337823e1615e966cd91f9a3c2b16dd61 Mon Sep 17 00:00:00 2001 From: Peter Badida Date: Sat, 20 Oct 2018 11:19:45 +0200 Subject: [PATCH] Fix pyjnius setup.py patches --- .../pyjnius/genericndkbuild_jnienv_getter.patch | 10 +++++----- .../recipes/pyjnius/sdl2_jnienv_getter.patch | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pythonforandroid/recipes/pyjnius/genericndkbuild_jnienv_getter.patch b/pythonforandroid/recipes/pyjnius/genericndkbuild_jnienv_getter.patch index 50c62cb395..ff2699415b 100644 --- a/pythonforandroid/recipes/pyjnius/genericndkbuild_jnienv_getter.patch +++ b/pythonforandroid/recipes/pyjnius/genericndkbuild_jnienv_getter.patch @@ -16,10 +16,10 @@ index 740510f..0c8e55f 100644 +++ b/setup.py @@ -53,7 +53,7 @@ except ImportError: - if platform == 'android': + if PLATFORM == 'android': # for android, we use SDL... -- libraries = ['sdl', 'log'] -+ libraries = ['main', 'log'] - library_dirs = ['libs/' + getenv('ARCH')] - elif platform == 'darwin': +- LIBRARIES = ['sdl', 'log'] ++ LIBRARIES = ['main', 'log'] + LIBRARY_DIRS = ['libs/' + getenv('ARCH')] + elif PLATFORM == 'darwin': import subprocess diff --git a/pythonforandroid/recipes/pyjnius/sdl2_jnienv_getter.patch b/pythonforandroid/recipes/pyjnius/sdl2_jnienv_getter.patch index a366138928..d208e5f69c 100644 --- a/pythonforandroid/recipes/pyjnius/sdl2_jnienv_getter.patch +++ b/pythonforandroid/recipes/pyjnius/sdl2_jnienv_getter.patch @@ -16,10 +16,10 @@ index 740510f..0c8e55f 100644 +++ b/setup.py @@ -53,7 +53,7 @@ except ImportError: - if platform == 'android': + if PLATFORM == 'android': # for android, we use SDL... -- libraries = ['sdl', 'log'] -+ libraries = ['SDL2', 'log'] - library_dirs = ['libs/' + getenv('ARCH')] - elif platform == 'darwin': +- LIBRARIES = ['sdl', 'log'] ++ LIBRARIES = ['SDL2', 'log'] + LIBRARY_DIRS = ['libs/' + getenv('ARCH')] + elif PLATFORM == 'darwin': import subprocess