Changed Android.mk for sdl2 to work with crystax

inclement · inclement · commit cecdfc850171 · 2016-01-10T21:23:13.000Z
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -102,8 +102,8 @@ def get_env(self):
 
         env['ARCH'] = self.arch
 
-        if self.ctx.ndk_is_crystax:  # AND: should use the right python version from the python recipe
-            env['CRYSTAX_PYTHON_VERSION'] = '3.5'
+        if self.ctx.python_recipe.from_crystax:
+            env['CRYSTAX_PYTHON_VERSION'] = self.ctx.python_recipe.version
 
         return env
 
diff --git a/pythonforandroid/bootstraps/sdl2/build/jni/src/Android.mk b/pythonforandroid/bootstraps/sdl2/build/jni/src/Android.mk
@@ -16,12 +16,12 @@ LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../other_builds/$(PYTHON2_NAME)/$(ARCH)
 
 LOCAL_SHARED_LIBRARIES := SDL2 python_shared
 
-LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog $(EXTRA_LDLIBS) #-lpython2.7
+LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog $(EXTRA_LDLIBS)
 
 LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/$(PYTHON2_NAME)/$(ARCH)/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
 
 include $(BUILD_SHARED_LIBRARY)
 
 ifdef CRYSTAX_PYTHON_VERSION
-	$(call import-module,python/$(CRYSTAX_PYTHON_VERSION))
+    $(call import-module,python/$(CRYSTAX_PYTHON_VERSION))
 endif
