Browse Source

Android Makefile update

louyihua 8 years ago
parent
commit
966a775da0
2 changed files with 9 additions and 8 deletions
  1. 0 1
      android/jni/SDL2/README
  2. 9 7
      android/jni/src/Android.mk

+ 0 - 1
android/jni/SDL2/README

@@ -1 +0,0 @@
-Download SDL 2.0 from http://libsdl.org/ and extract to here.

+ 9 - 7
android/jni/src/Android.mk

@@ -1,19 +1,21 @@
-LOCAL_PATH := $(call my-dir)
+SDLPAL_LOCAL_PATH := $(call my-dir)
+SDL_PATH := $(SDLPAL_LOCAL_PATH)/../../../SDL2
 
-include $(CLEAR_VARS)
+include $(SDL_PATH)/Android.mk
 
+include $(CLEAR_VARS)
+LOCAL_PATH := $(SDLPAL_LOCAL_PATH)
 LOCAL_MODULE := main
 
-SDL_PATH := ../../../SDL2
 OGG_PATH := ../../../liboggvorbis
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include $(LOCAL_PATH)/$(OGG_PATH)/include $(LOCAL_PATH)/$(OGG_PATH)/src
 
 LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
-    $(wildcard ../../*.cpp) $(wildcard ../../*.c) \
-    $(wildcard ../../adplug/*.c) $(wildcard ../../adplug/*.cpp) \
-    $(wildcard ../../liboggvorbis/src/*.c) \
-    $(wildcard ../../libmad/*.c)
+    $(wildcard $(LOCAL_PATH)/../../*.cpp) $(wildcard $(LOCAL_PATH)/../../*.c) \
+    $(wildcard $(LOCAL_PATH)/../../adplug/*.c) $(wildcard $(LOCAL_PATH)/../../adplug/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/../../liboggvorbis/src/*.c) \
+    $(wildcard $(LOCAL_PATH)/../../libmad/*.c)
 
 LOCAL_CFLAGS += -std=c99