Skip to content

Commit 59a5916

Browse files
committed
Changed Android.mk back to old version
I think the changes in -I and -L paths were due to the gradle build file including the NDK build, whereas this should already be done now.
1 parent 7c841fb commit 59a5916

File tree

1 file changed

+2
-4
lines changed
  • pythonforandroid/bootstraps/sdl2_gradle/build/jni/src

1 file changed

+2
-4
lines changed

pythonforandroid/bootstraps/sdl2_gradle/build/jni/src/Android.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
1313
start.c
1414

1515
LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../other_builds/$(PYTHON2_NAME)/$(ARCH)/python2/python-install/include/python2.7 $(EXTRA_CFLAGS)
16-
LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../python-install/include/python2.7 $(EXTRA_CFLAGS)
1716

18-
LOCAL_SHARED_LIBRARIES := SDL2
17+
LOCAL_SHARED_LIBRARIES := SDL2 python_shared
1918

20-
LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog -lpython2.7 $(EXTRA_LDLIBS)
19+
LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog $(EXTRA_LDLIBS)
2120

2221
LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/$(PYTHON2_NAME)/$(ARCH)/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
23-
LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
2422

2523
include $(BUILD_SHARED_LIBRARY)
2624

0 commit comments

Comments
 (0)