From a8002c54ee804b558a1b4f9b9588fac4df707007 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 11 May 2010 12:53:35 +0300 Subject: [PATCH] Added SDL_image to application include path, removed Java-specific defines from application makefile --- alienblaster/project/jni/application/Android.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/alienblaster/project/jni/application/Android.mk b/alienblaster/project/jni/application/Android.mk index 87757d134..c4b3ab370 100644 --- a/alienblaster/project/jni/application/Android.mk +++ b/alienblaster/project/jni/application/Android.mk @@ -8,11 +8,10 @@ APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -ty # Add more subdirs here, like src/subdir1 src/subdir2 -LOCAL_CFLAGS := -DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \ - -DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\" \ - $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \ +LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \ -I$(LOCAL_PATH)/../sdl/include \ -I$(LOCAL_PATH)/../sdl_mixer \ + -I$(LOCAL_PATH)/../sdl_image \ -I$(LOCAL_PATH)/../stlport/stlport \ @@ -25,7 +24,7 @@ LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wil LOCAL_SHARED_LIBRARIES := sdl sdl_mixer tremor stlport -LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog +LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz include $(BUILD_SHARED_LIBRARY)