diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 779da95..0000000 --- a/Android.mk +++ /dev/null @@ -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) - - diff --git a/Linux.mk b/Generic.mk similarity index 83% rename from Linux.mk rename to Generic.mk index f0ec43b..da8a300 100644 --- a/Linux.mk +++ b/Generic.mk @@ -13,10 +13,15 @@ LOCAL_C_INCLUDES := $(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)\"" \ -Wall +ifeq ("$(TARGET_OS)","Windows") + LOCAL_CFLAGS += -D_WIN32 +else + LOCAL_CFLAGS += -DLUA_USE_LINUX +endif + # load the common sources file of the platform include $(LOCAL_PATH)/file.mk