simplify makefiles

Android.mk

@@ -12,17 +12,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/lua/
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-ifeq ($(DEBUG),1)
-LOCAL_CFLAGS := -D__PLATFORM__Android \
-                -DLUA_COMPAT_ALL \
+LOCAL_CFLAGS := -DLUA_COMPAT_ALL \
                 -DLUA_USE_LINUX \
-                -DLUA_VERSION_TAG_NAME="\"5.2-debug\""
-else
-LOCAL_CFLAGS := -D__PLATFORM__Android \
-                -DLUA_COMPAT_ALL \
-                -DLUA_USE_LINUX \
-                -DLUA_VERSION_TAG_NAME="\"5.2-release\""
-endif
+                -DLUA_VERSION_TAG_NAME="\"5.2-$(BUILD_DIRECTORY_MODE)\""
 
 # load the common sources file of the platform
 include $(LOCAL_PATH)/file.mk

Linux.mk

@@ -12,18 +12,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/lua/
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-ifeq ($(DEBUG),1)
-LOCAL_CFLAGS := -D__PLATFORM__Linux \
-                -DLUA_COMPAT_ALL \
+LOCAL_CFLAGS := -DLUA_COMPAT_ALL \
                 -DLUA_USE_LINUX \
-                -DLUA_VERSION_TAG_NAME="\"5.2-debug\"" \
+                -DLUA_VERSION_TAG_NAME="\"5.2-$(BUILD_DIRECTORY_MODE)\"" \
                 -Wall
-else
-LOCAL_CFLAGS := -D__PLATFORM__Linux \
-                -DLUA_COMPAT_ALL \
-                -DLUA_VERSION_TAG_NAME="\"5.2-release\"" \
-                -DLUA_USE_LINUX
-endif
 
 # load the common sources file of the platform
 include $(LOCAL_PATH)/file.mk

lua/llex.cpp

@@ -210,7 +210,7 @@ static void buffreplace (LexState *ls, char from, char to) {
 ** the one defined in the current locale and check again
 */
 static void trydecpoint (LexState *ls, SemInfo *seminfo) {
-#ifndef __PLATFORM__Android
+#ifndef __TARGET_OS__Android
   char old = ls->decpoint;
   ls->decpoint = getlocaledecpoint();
   buffreplace(ls, old, ls->decpoint);  /* try new decimal separator */