generic-library/lua
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify makefiles

Browse Source
This commit is contained in:
Edouard DUPIN 2012-08-10 12:13:25 +02:00
parent 2d309289f3
commit c620bdd5c4
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Android.mk
View File

@ -12,17 +12,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/lua/
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
ifeq ($(DEBUG),1) LOCAL_CFLAGS := -DLUA_COMPAT_ALL \
LOCAL_CFLAGS := -D__PLATFORM__Android \
-DLUA_COMPAT_ALL \
-DLUA_USE_LINUX \ -DLUA_USE_LINUX \
-DLUA_VERSION_TAG_NAME="\"5.2-debug\"" -DLUA_VERSION_TAG_NAME="\"5.2-$(BUILD_DIRECTORY_MODE)\""
else
LOCAL_CFLAGS := -D__PLATFORM__Android \
-DLUA_COMPAT_ALL \
-DLUA_USE_LINUX \
-DLUA_VERSION_TAG_NAME="\"5.2-release\""
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

12
Linux.mk
View File

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

2
lua/llex.cpp
View File

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