Added SDL_image to application include path, removed Java-specific defines from application makefile

This commit is contained in:
pelya
2010-05-11 12:53:35 +03:00
parent 500d845cc6
commit a8002c54ee

View File

@@ -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)