fix

AI_core_vs2017solution/build/android/jni/Android.mk

@@ -9,12 +9,12 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := ocgcore
 
 ifndef NDEBUG
-LOCAL_CFLAGS += -g -D_DEBUG
+LOCAL_CFLAGS += -g -D_DEBUG -DLUA_USE_POSIX -DLUA_COMPAT_5_2
 else
-LOCAL_CFLAGS += -fexpensive-optimizations -O3 
+LOCAL_CFLAGS += -fexpensive-optimizations -O3 -DLUA_USE_POSIX -DLUA_COMPAT_5_2
 endif
 
-ifeq ($(TARGET_ARCH_ABI),x86)
+ifeq ($(TARGET_ARCH_ABI), x86)
 LOCAL_CFLAGS += -fno-stack-protector
 endif
 
@@ -27,54 +27,55 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/ocgcore/lua
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/ocgcore/sqlite3
 
 LOCAL_SRC_FILES := ocgcore/lua/lapi.c \
-				   ocgcore/lua/lauxlib.c \
-				   ocgcore/lua/lbaselib.c \
-				   ocgcore/lua/lbitlib.c \
-				   ocgcore/lua/lcode.c \
-				   ocgcore/lua/lcorolib.c \
-				   ocgcore/lua/lctype.c \
-				   ocgcore/lua/ldblib.c \
-				   ocgcore/lua/ldebug.c \
-				   ocgcore/lua/ldo.c \
-				   ocgcore/lua/ldump.c \
-				   ocgcore/lua/lfunc.c \
-				   ocgcore/lua/lgc.c \
-				   ocgcore/lua/linit.c \
-				   ocgcore/lua/liolib.c \
-				   ocgcore/lua/llex.c \
-				   ocgcore/lua/lmathlib.c \
-				   ocgcore/lua/lmem.c \
-				   ocgcore/lua/loadlib.c \
-				   ocgcore/lua/lobject.c \
-				   ocgcore/lua/lopcodes.c \
-				   ocgcore/lua/loslib.c \
-				   ocgcore/lua/lparser.c \
-				   ocgcore/lua/lstate.c \
-				   ocgcore/lua/lstring.c \
-				   ocgcore/lua/lstrlib.c \
-				   ocgcore/lua/ltable.c \
-				   ocgcore/lua/ltablib.c \
-				   ocgcore/lua/ltm.c \
-				   ocgcore/lua/lundump.c \
-				   ocgcore/lua/lvm.c \
-				   ocgcore/lua/lzio.c \
-				   ocgcore/card.cpp \
-				   ocgcore/duel.cpp \
-				   ocgcore/effect.cpp \
-				   ocgcore/field.cpp \
-				   ocgcore/group.cpp \
-				   ocgcore/interpreter.cpp \
-				   ocgcore/libcard.cpp \
-				   ocgcore/libdebug.cpp \
-				   ocgcore/libduel.cpp \
-				   ocgcore/libeffect.cpp \
-				   ocgcore/libgroup.cpp \
-				   ocgcore/mem.cpp \
-				   ocgcore/ocgapi.cpp \
-				   ocgcore/operations.cpp \
-				   ocgcore/playerop.cpp \
-				   ocgcore/processor.cpp \
-				   ocgcore/scriptlib.cpp \
+                   ocgcore/lua/lauxlib.c \
+                   ocgcore/lua/lbaselib.c \
+                   ocgcore/lua/lbitlib.c \
+                   ocgcore/lua/lcode.c \
+                   ocgcore/lua/lcorolib.c \
+                   ocgcore/lua/lctype.c \
+                   ocgcore/lua/ldblib.c \
+                   ocgcore/lua/ldebug.c \
+                   ocgcore/lua/ldo.c \
+                   ocgcore/lua/ldump.c \
+                   ocgcore/lua/lfunc.c \
+                   ocgcore/lua/lgc.c \
+                   ocgcore/lua/linit.c \
+                   ocgcore/lua/liolib.c \
+                   ocgcore/lua/llex.c \
+                   ocgcore/lua/lmathlib.c \
+                   ocgcore/lua/lmem.c \
+                   ocgcore/lua/loadlib.c \
+                   ocgcore/lua/lobject.c \
+                   ocgcore/lua/lopcodes.c \
+                   ocgcore/lua/loslib.c \
+                   ocgcore/lua/lparser.c \
+                   ocgcore/lua/lstate.c \
+                   ocgcore/lua/lstring.c \
+                   ocgcore/lua/lstrlib.c \
+                   ocgcore/lua/ltable.c \
+                   ocgcore/lua/ltablib.c \
+                   ocgcore/lua/ltm.c \
+                   ocgcore/lua/lundump.c \
+                   ocgcore/lua/lutf8lib.c \
+                   ocgcore/lua/lvm.c \
+                   ocgcore/lua/lzio.c \
+                   ocgcore/card.cpp \
+                   ocgcore/duel.cpp \
+                   ocgcore/effect.cpp \
+                   ocgcore/field.cpp \
+                   ocgcore/group.cpp \
+                   ocgcore/interpreter.cpp \
+                   ocgcore/libcard.cpp \
+                   ocgcore/libdebug.cpp \
+                   ocgcore/libduel.cpp \
+                   ocgcore/libeffect.cpp \
+                   ocgcore/libgroup.cpp \
+                   ocgcore/mem.cpp \
+                   ocgcore/ocgapi.cpp \
+                   ocgcore/operations.cpp \
+                   ocgcore/playerop.cpp \
+                   ocgcore/processor.cpp \
+                   ocgcore/scriptlib.cpp \
 
 LOCAL_LDLIBS := -llog
 include $(BUILD_SHARED_LIBRARY)

AI_core_vs2017solution/ocgcore/lua/lmathlib.c

@@ -184,8 +184,11 @@ static int math_log (lua_State *L) {
   else {
     lua_Number base = luaL_checknumber(L, 2);
 #if !defined(LUA_USE_C89)
+#if __ANDROID__
+#else
     if (base == l_mathop(2.0))
       res = l_mathop(log2)(x); else
+#endif
 #endif
     if (base == l_mathop(10.0))
       res = l_mathop(log10)(x);

AI_core_vs2017solution/ocgcore/lua/luaconf.h

@@ -677,8 +677,12 @@
 ** macro must include header 'locale.h'.)
 */
 #if !defined(lua_getlocaledecpoint)
+#if __ANDROID__
+#define lua_getlocaledecpoint()        ('.')
+#else
 #define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
 #endif
+#endif
 
 /* }================================================================== */