Added python3crystax alternative dep for sdl2

inclement · inclement · commit c4e2b8988938 · 2016-01-10T21:18:17.000Z
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -887,8 +887,10 @@ def get_recipe_env(self, arch):
         env['LDFLAGS'] = env['LDFLAGS'] + ' -L{} '.format(
             self.ctx.get_libs_dir(arch.arch) +
             ' -L{} '.format(self.ctx.libs_dir)) + ' -L/home/asandy/.local/share/python-for-android/build/bootstrap_builds/sdl2python3crystax/libs/armeabi '
-        # env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink-jb')
-        env['LDSHARED'] = env['CC'] + ' -shared'
+        if self.ctx.ndk_is_crystax:
+            env['LDSHARED'] = env['CC'] + ' -shared'
+        else:
+            env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink-jb')
         shprint(sh.whereis, env['LDSHARED'], _env=env)
         env['LIBLINK'] = 'NOTNONE'
         env['NDKPLATFORM'] = self.ctx.ndk_platform
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
@@ -9,7 +9,7 @@ class LibSDL2Recipe(BootstrapNDKRecipe):
 
     dir_name = 'SDL'
 
-    depends = ['python2', 'sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
+    depends = [('python2', 'python3crystax'), 'sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
     conflicts = ['sdl', 'pygame', 'pygame_bootstrap_components']
 
     patches = ['add_nativeSetEnv.patch']
