simplify makefiles

This commit is contained in:
Edouard Dupin 2012-08-15 20:48:28 +02:00
parent c620bdd5c4
commit fa4bf39278
2 changed files with 6 additions and 27 deletions

View File

@ -1,26 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# name of the librairy
LOCAL_MODULE := lua
# name of the dependency
LOCAL_STATIC_LIBRARIES := etk
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/lua/
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CFLAGS := -DLUA_COMPAT_ALL \
-DLUA_USE_LINUX \
-DLUA_VERSION_TAG_NAME="\"5.2-$(BUILD_DIRECTORY_MODE)\""
# load the common sources file of the platform
include $(LOCAL_PATH)/file.mk
LOCAL_SRC_FILES := $(FILE_LIST)
include $(BUILD_STATIC_LIBRARY)

View File

@ -13,10 +13,15 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/lua/
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
LOCAL_CFLAGS := -DLUA_COMPAT_ALL \ LOCAL_CFLAGS := -DLUA_COMPAT_ALL \
-DLUA_USE_LINUX \
-DLUA_VERSION_TAG_NAME="\"5.2-$(BUILD_DIRECTORY_MODE)\"" \ -DLUA_VERSION_TAG_NAME="\"5.2-$(BUILD_DIRECTORY_MODE)\"" \
-Wall -Wall
ifeq ("$(TARGET_OS)","Windows")
LOCAL_CFLAGS += -D_WIN32
else
LOCAL_CFLAGS += -DLUA_USE_LINUX
endif
# load the common sources file of the platform # load the common sources file of the platform
include $(LOCAL_PATH)/file.mk include $(LOCAL_PATH)/file.mk