Update build

AI_core_vs2017solution/build/android/jni/Android.mk

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)/../../..
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := sqlite3
-LOCAL_SRC_FILES := ocgcore/sqlite3.c
+LOCAL_SRC_FILES := ocgcore/sqlite3/sqlite3.c
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -23,39 +23,41 @@ LOCAL_CFLAGS += -mno-unaligned-access
 endif
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ocgcore
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/ocgcore/lua
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/ocgcore/sqlite3
 
-LOCAL_SRC_FILES := ocgcore/lapi.c \
-				   ocgcore/lauxlib.c \
-				   ocgcore/lbaselib.c \
-				   ocgcore/lbitlib.c \
-				   ocgcore/lcode.c \
-				   ocgcore/lcorolib.c \
-				   ocgcore/lctype.c \
-				   ocgcore/ldblib.c \
-				   ocgcore/ldebug.c \
-				   ocgcore/ldo.c \
-				   ocgcore/ldump.c \
-				   ocgcore/lfunc.c \
-				   ocgcore/lgc.c \
-				   ocgcore/linit.c \
-				   ocgcore/liolib.c \
-				   ocgcore/llex.c \
-				   ocgcore/lmathlib.c \
-				   ocgcore/lmem.c \
-				   ocgcore/loadlib.c \
-				   ocgcore/lobject.c \
-				   ocgcore/lopcodes.c \
-				   ocgcore/loslib.c \
-				   ocgcore/lparser.c \
-				   ocgcore/lstate.c \
-				   ocgcore/lstring.c \
-				   ocgcore/lstrlib.c \
-				   ocgcore/ltable.c \
-				   ocgcore/ltablib.c \
-				   ocgcore/ltm.c \
-				   ocgcore/lundump.c \
-				   ocgcore/lvm.c \
-				   ocgcore/lzio.c \
+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 \

AI_core_vs2017solution/build/gmake.linux/ocgcore.make

@@ -20,11 +20,11 @@ ifndef AR
 endif
 
 ifeq ($(config),release)
-  OBJDIR     = ../../obj/Linux/x86_64/ocgcore
-  TARGETDIR  = ../../bin/x86_64
+  OBJDIR     = ../../obj/gmake.linux/x86_64/ocgcore
+  TARGETDIR  = ../../bin/gmake.linux/x86_64
   TARGET     = $(TARGETDIR)/libocgcore.so
   DEFINES   += -DLUA_USE_LINUX
-  INCLUDES  += 
+  INCLUDES  += -I../../ocgcore/lua -I../../ocgcore/sqlite3
   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
   CFLAGS    += $(CPPFLAGS) $(ARCH) -Os -fPIC -fno-strict-aliasing -Wno-multichar
   CXXFLAGS  += $(CFLAGS) -std=gnu++0x
@@ -42,11 +42,11 @@ ifeq ($(config),release)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR     = ../../obj/Linux/x86/ocgcore
-  TARGETDIR  = ../../bin/x86
+  OBJDIR     = ../../obj/gmake.linux/x86/ocgcore
+  TARGETDIR  = ../../bin/gmake.linux/x86
   TARGET     = $(TARGETDIR)/libocgcore.so
   DEFINES   += -DLUA_USE_LINUX
-  INCLUDES  += 
+  INCLUDES  += -I../../ocgcore/lua -I../../ocgcore/sqlite3
   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
   CFLAGS    += $(CPPFLAGS) $(ARCH) -Os -m32 -fPIC -fno-strict-aliasing -Wno-multichar
   CXXFLAGS  += $(CFLAGS) -std=gnu++0x
@@ -173,100 +173,100 @@ $(GCH): $(PCH)
 	$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 endif
 
-$(OBJDIR)/lapi.o: ../../ocgcore/lapi.c
+$(OBJDIR)/lapi.o: ../../ocgcore/lua/lapi.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lauxlib.o: ../../ocgcore/lauxlib.c
+$(OBJDIR)/lauxlib.o: ../../ocgcore/lua/lauxlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lbaselib.o: ../../ocgcore/lbaselib.c
+$(OBJDIR)/lbaselib.o: ../../ocgcore/lua/lbaselib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lbitlib.o: ../../ocgcore/lbitlib.c
+$(OBJDIR)/lbitlib.o: ../../ocgcore/lua/lbitlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lcode.o: ../../ocgcore/lcode.c
+$(OBJDIR)/lcode.o: ../../ocgcore/lua/lcode.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lcorolib.o: ../../ocgcore/lcorolib.c
+$(OBJDIR)/lcorolib.o: ../../ocgcore/lua/lcorolib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lctype.o: ../../ocgcore/lctype.c
+$(OBJDIR)/lctype.o: ../../ocgcore/lua/lctype.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ldblib.o: ../../ocgcore/ldblib.c
+$(OBJDIR)/ldblib.o: ../../ocgcore/lua/ldblib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ldebug.o: ../../ocgcore/ldebug.c
+$(OBJDIR)/ldebug.o: ../../ocgcore/lua/ldebug.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ldo.o: ../../ocgcore/ldo.c
+$(OBJDIR)/ldo.o: ../../ocgcore/lua/ldo.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ldump.o: ../../ocgcore/ldump.c
+$(OBJDIR)/ldump.o: ../../ocgcore/lua/ldump.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lfunc.o: ../../ocgcore/lfunc.c
+$(OBJDIR)/lfunc.o: ../../ocgcore/lua/lfunc.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lgc.o: ../../ocgcore/lgc.c
+$(OBJDIR)/lgc.o: ../../ocgcore/lua/lgc.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/linit.o: ../../ocgcore/linit.c
+$(OBJDIR)/linit.o: ../../ocgcore/lua/linit.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/liolib.o: ../../ocgcore/liolib.c
+$(OBJDIR)/liolib.o: ../../ocgcore/lua/liolib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/llex.o: ../../ocgcore/llex.c
+$(OBJDIR)/llex.o: ../../ocgcore/lua/llex.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lmathlib.o: ../../ocgcore/lmathlib.c
+$(OBJDIR)/lmathlib.o: ../../ocgcore/lua/lmathlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lmem.o: ../../ocgcore/lmem.c
+$(OBJDIR)/lmem.o: ../../ocgcore/lua/lmem.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/loadlib.o: ../../ocgcore/loadlib.c
+$(OBJDIR)/loadlib.o: ../../ocgcore/lua/loadlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lobject.o: ../../ocgcore/lobject.c
+$(OBJDIR)/lobject.o: ../../ocgcore/lua/lobject.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lopcodes.o: ../../ocgcore/lopcodes.c
+$(OBJDIR)/lopcodes.o: ../../ocgcore/lua/lopcodes.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/loslib.o: ../../ocgcore/loslib.c
+$(OBJDIR)/loslib.o: ../../ocgcore/lua/loslib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lparser.o: ../../ocgcore/lparser.c
+$(OBJDIR)/lparser.o: ../../ocgcore/lua/lparser.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lstate.o: ../../ocgcore/lstate.c
+$(OBJDIR)/lstate.o: ../../ocgcore/lua/lstate.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lstring.o: ../../ocgcore/lstring.c
+$(OBJDIR)/lstring.o: ../../ocgcore/lua/lstring.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lstrlib.o: ../../ocgcore/lstrlib.c
+$(OBJDIR)/lstrlib.o: ../../ocgcore/lua/lstrlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ltable.o: ../../ocgcore/ltable.c
+$(OBJDIR)/ltable.o: ../../ocgcore/lua/ltable.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ltablib.o: ../../ocgcore/ltablib.c
+$(OBJDIR)/ltablib.o: ../../ocgcore/lua/ltablib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/ltm.o: ../../ocgcore/ltm.c
+$(OBJDIR)/ltm.o: ../../ocgcore/lua/ltm.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lundump.o: ../../ocgcore/lundump.c
+$(OBJDIR)/lundump.o: ../../ocgcore/lua/lundump.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lvm.o: ../../ocgcore/lvm.c
+$(OBJDIR)/lvm.o: ../../ocgcore/lua/lvm.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/lzio.o: ../../ocgcore/lzio.c
+$(OBJDIR)/lzio.o: ../../ocgcore/lua/lzio.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
 $(OBJDIR)/card.o: ../../ocgcore/card.cpp

AI_core_vs2017solution/build/gmake.windows/ocgcore.make

@@ -20,16 +20,16 @@ ifndef RESCOMP
 endif
 
 ifeq ($(config),release)
-  OBJDIR     = ../../obj/Windows/x86_64/ocgcore
-  TARGETDIR  = ../../bin/x86_64
+  OBJDIR     = ../../obj/gmake.windows/x86_64/ocgcore
+  TARGETDIR  = ../../bin/gmake.windows/x86_64
   TARGET     = $(TARGETDIR)/ocgcore.dll
   DEFINES   +=
-  INCLUDES  +=
+  INCLUDES  += -I../../ocgcore/lua -I../../ocgcore/sqlite3
   ALL_CPPFLAGS  += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
   ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Os -static-libgcc
   ALL_CXXFLAGS  += $(CXXFLAGS) $(ALL_CFLAGS) -std=gnu++0x -fpermissive
   ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/x86_64/libocgcore.a"
+  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/gmake.windows/x86_64/libocgcore.a"
   LDDEPS    +=
   LIBS      += $(LDDEPS)
   LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
@@ -42,16 +42,16 @@ ifeq ($(config),release)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR     = ../../obj/Windows/x86/ocgcore
-  TARGETDIR  = ../../bin/x86
+  OBJDIR     = ../../obj/gmake.windows/x86/ocgcore
+  TARGETDIR  = ../../bin/gmake.windows/x86
   TARGET     = $(TARGETDIR)/ocgcore.dll
   DEFINES   +=
-  INCLUDES  +=
+  INCLUDES  += -I../../ocgcore/lua -I../../ocgcore/sqlite3
   ALL_CPPFLAGS  += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
   ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Os -m32 -static-libgcc
   ALL_CXXFLAGS  += $(CXXFLAGS) $(ALL_CFLAGS) -std=gnu++0x
   ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/x86/libocgcore.a" -m32 -L/usr/lib32
+  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/gmake.windows/x86/libocgcore.a" -m32 -L/usr/lib32
   LDDEPS    +=
   LIBS      += $(LDDEPS)
   LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
@@ -172,131 +172,131 @@ $(GCH): $(PCH)
 	$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
 endif
 
-$(OBJDIR)/lapi.o: ../../ocgcore/lapi.c
+$(OBJDIR)/lapi.o: ../../ocgcore/lua/lapi.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lauxlib.o: ../../ocgcore/lauxlib.c
+$(OBJDIR)/lauxlib.o: ../../ocgcore/lua/lauxlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lbaselib.o: ../../ocgcore/lbaselib.c
+$(OBJDIR)/lbaselib.o: ../../ocgcore/lua/lbaselib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lbitlib.o: ../../ocgcore/lbitlib.c
+$(OBJDIR)/lbitlib.o: ../../ocgcore/lua/lbitlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lcode.o: ../../ocgcore/lcode.c
+$(OBJDIR)/lcode.o: ../../ocgcore/lua/lcode.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lcorolib.o: ../../ocgcore/lcorolib.c
+$(OBJDIR)/lcorolib.o: ../../ocgcore/lua/lcorolib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lctype.o: ../../ocgcore/lctype.c
+$(OBJDIR)/lctype.o: ../../ocgcore/lua/lctype.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/ldblib.o: ../../ocgcore/ldblib.c
+$(OBJDIR)/ldblib.o: ../../ocgcore/lua/ldblib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/ldebug.o: ../../ocgcore/ldebug.c
+$(OBJDIR)/ldebug.o: ../../ocgcore/lua/ldebug.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/ldo.o: ../../ocgcore/ldo.c
+$(OBJDIR)/ldo.o: ../../ocgcore/lua/ldo.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/ldump.o: ../../ocgcore/ldump.c
+$(OBJDIR)/ldump.o: ../../ocgcore/lua/ldump.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lfunc.o: ../../ocgcore/lfunc.c
+$(OBJDIR)/lfunc.o: ../../ocgcore/lua/lfunc.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lgc.o: ../../ocgcore/lgc.c
+$(OBJDIR)/lgc.o: ../../ocgcore/lua/lgc.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/linit.o: ../../ocgcore/linit.c
+$(OBJDIR)/linit.o: ../../ocgcore/lua/linit.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/liolib.o: ../../ocgcore/liolib.c
+$(OBJDIR)/liolib.o: ../../ocgcore/lua/liolib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/llex.o: ../../ocgcore/llex.c
+$(OBJDIR)/llex.o: ../../ocgcore/lua/llex.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lmathlib.o: ../../ocgcore/lmathlib.c
+$(OBJDIR)/lmathlib.o: ../../ocgcore/lua/lmathlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lmem.o: ../../ocgcore/lmem.c
+$(OBJDIR)/lmem.o: ../../ocgcore/lua/lmem.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/loadlib.o: ../../ocgcore/loadlib.c
+$(OBJDIR)/loadlib.o: ../../ocgcore/lua/loadlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lobject.o: ../../ocgcore/lobject.c
+$(OBJDIR)/lobject.o: ../../ocgcore/lua/lobject.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lopcodes.o: ../../ocgcore/lopcodes.c
+$(OBJDIR)/lopcodes.o: ../../ocgcore/lua/lopcodes.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/loslib.o: ../../ocgcore/loslib.c
+$(OBJDIR)/loslib.o: ../../ocgcore/lua/loslib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lparser.o: ../../ocgcore/lparser.c
+$(OBJDIR)/lparser.o: ../../ocgcore/lua/lparser.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lstate.o: ../../ocgcore/lstate.c
+$(OBJDIR)/lstate.o: ../../ocgcore/lua/lstate.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lstring.o: ../../ocgcore/lstring.c
+$(OBJDIR)/lstring.o: ../../ocgcore/lua/lstring.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lstrlib.o: ../../ocgcore/lstrlib.c
+$(OBJDIR)/lstrlib.o: ../../ocgcore/lua/lstrlib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/ltable.o: ../../ocgcore/ltable.c
+$(OBJDIR)/ltable.o: ../../ocgcore/lua/ltable.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/ltablib.o: ../../ocgcore/ltablib.c
+$(OBJDIR)/ltablib.o: ../../ocgcore/lua/ltablib.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/ltm.o: ../../ocgcore/ltm.c
+$(OBJDIR)/ltm.o: ../../ocgcore/lua/ltm.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lundump.o: ../../ocgcore/lundump.c
+$(OBJDIR)/lundump.o: ../../ocgcore/lua/lundump.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lvm.o: ../../ocgcore/lvm.c
+$(OBJDIR)/lvm.o: ../../ocgcore/lua/lvm.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 
-$(OBJDIR)/lzio.o: ../../ocgcore/lzio.c
+$(OBJDIR)/lzio.o: ../../ocgcore/lua/lzio.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 

AI_core_vs2017solution/build/gmake.windows/sqlite3.make

@@ -20,8 +20,8 @@ ifndef RESCOMP
 endif
 
 ifeq ($(config),release)
-  OBJDIR     = ../../obj/Windows/x86_64/sqlite3
-  TARGETDIR  = ../../bin/x86_64
+  OBJDIR     = ../../obj/gmake.windows/x86_64/sqlite3
+  TARGETDIR  = ../../bin/gmake.windows/x86_64
   TARGET     = $(TARGETDIR)/sqlite3.dll
   DEFINES   +=
   INCLUDES  +=
@@ -29,7 +29,7 @@ ifeq ($(config),release)
   ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Os -static-libgcc
   ALL_CXXFLAGS  += $(CXXFLAGS) $(ALL_CFLAGS)
   ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/x86_64/libsqlite3.a"
+  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/gmake.windows/x86_64/libsqlite3.a"
   LDDEPS    +=
   LIBS      += $(LDDEPS)
   LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
@@ -42,8 +42,8 @@ ifeq ($(config),release)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR     = ../../obj/Windows/x86/sqlite3
-  TARGETDIR  = ../../bin/x86
+  OBJDIR     = ../../obj/gmake.windows/x86/sqlite3
+  TARGETDIR  = ../../bin/gmake.windows/x86
   TARGET     = $(TARGETDIR)/sqlite3.dll
   DEFINES   +=
   INCLUDES  +=
@@ -51,7 +51,7 @@ ifeq ($(config),release32)
   ALL_CFLAGS    += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Os -m32 -static-libgcc
   ALL_CXXFLAGS  += $(CXXFLAGS) $(ALL_CFLAGS)
   ALL_RESFLAGS  += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/x86_64/libsqlite3.a" -m32 -L/usr/lib32
+  ALL_LDFLAGS   += $(LDFLAGS) -s -shared -Wl,--out-implib="../../bin/gmake.windows/x86/libsqlite3.a" -m32 -L/usr/lib32
   LDDEPS    +=
   LIBS      += $(LDDEPS)
   LINKCMD    = $(CXX) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
@@ -124,7 +124,7 @@ $(GCH): $(PCH)
 	$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
 endif
 
-$(OBJDIR)/sqlite3.o: ../../ocgcore/sqlite3.c
+$(OBJDIR)/sqlite3.o: ../../ocgcore/sqlite3/sqlite3.c
 	@echo $(notdir $<)
 	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
 

AI_core_vs2017solution/core.sln

@@ -7,20 +7,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ocgcore", "ocgcore\ocgcore.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Debug|x64.ActiveCfg = Debug|x64
 		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Debug|x64.Build.0 = Debug|x64
 		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Debug|x86.ActiveCfg = Debug|Win32
 		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Debug|x86.Build.0 = Debug|Win32
-		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Release|Any CPU.ActiveCfg = Release|Win32
 		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Release|x64.ActiveCfg = Release|x64
 		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Release|x64.Build.0 = Release|x64
 		{63635A2D-8303-46F7-8C8B-D1C36655F820}.Release|x86.ActiveCfg = Release|Win32

AI_core_vs2017solution/ocgcore/ocgcore.vcxproj

@@ -70,15 +70,27 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetExt>.dll</TargetExt>
+    <IncludePath>lua;sqlite3;$(IncludePath)</IncludePath>
+    <OutDir>..\bin\debug\Win32\</OutDir>
+    <IntDir>..\obj\Debug\Win32\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <TargetExt>.dll</TargetExt>
+    <IncludePath>lua;sqlite3;$(IncludePath)</IncludePath>
+    <OutDir>..\bin\release\Win32\</OutDir>
+    <IntDir>..\obj\Release\Win32\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.dll</TargetExt>
+    <IncludePath>lua;sqlite3;$(IncludePath)</IncludePath>
+    <OutDir>..\bin\debug\x64\</OutDir>
+    <IntDir>..\obj\Debug\x64\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetExt>.dll</TargetExt>
+    <IncludePath>lua;sqlite3;$(IncludePath)</IncludePath>
+    <OutDir>..\bin\release\x64\</OutDir>
+    <IntDir>..\obj\Release\x64\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -129,58 +141,82 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="lua\lapi.c" />
+    <ClCompile Include="lua\lauxlib.c" />
+    <ClCompile Include="lua\lbaselib.c" />
+    <ClCompile Include="lua\lbitlib.c" />
+    <ClCompile Include="lua\lcode.c" />
+    <ClCompile Include="lua\lcorolib.c" />
+    <ClCompile Include="lua\lctype.c" />
+    <ClCompile Include="lua\ldblib.c" />
+    <ClCompile Include="lua\ldebug.c" />
+    <ClCompile Include="lua\ldo.c" />
+    <ClCompile Include="lua\ldump.c" />
+    <ClCompile Include="lua\lfunc.c" />
+    <ClCompile Include="lua\lgc.c" />
+    <ClCompile Include="lua\linit.c" />
+    <ClCompile Include="lua\liolib.c" />
+    <ClCompile Include="lua\llex.c" />
+    <ClCompile Include="lua\lmathlib.c" />
+    <ClCompile Include="lua\lmem.c" />
+    <ClCompile Include="lua\loadlib.c" />
+    <ClCompile Include="lua\lobject.c" />
+    <ClCompile Include="lua\lopcodes.c" />
+    <ClCompile Include="lua\loslib.c" />
+    <ClCompile Include="lua\lparser.c" />
+    <ClCompile Include="lua\lstate.c" />
+    <ClCompile Include="lua\lstring.c" />
+    <ClCompile Include="lua\lstrlib.c" />
+    <ClCompile Include="lua\ltable.c" />
+    <ClCompile Include="lua\ltablib.c" />
+    <ClCompile Include="lua\ltm.c" />
+    <ClCompile Include="lua\lundump.c" />
+    <ClCompile Include="lua\lvm.c" />
+    <ClCompile Include="lua\lzio.c" />
     <ClCompile Include="card.cpp" />
     <ClCompile Include="duel.cpp" />
     <ClCompile Include="effect.cpp" />
     <ClCompile Include="field.cpp" />
     <ClCompile Include="group.cpp" />
     <ClCompile Include="interpreter.cpp" />
-    <ClCompile Include="lapi.c" />
-    <ClCompile Include="lauxlib.c" />
-    <ClCompile Include="lbaselib.c" />
-    <ClCompile Include="lbitlib.c" />
-    <ClCompile Include="lcode.c" />
-    <ClCompile Include="lcorolib.c" />
-    <ClCompile Include="lctype.c" />
-    <ClCompile Include="ldblib.c" />
-    <ClCompile Include="ldebug.c" />
-    <ClCompile Include="ldo.c" />
-    <ClCompile Include="ldump.c" />
-    <ClCompile Include="lfunc.c" />
-    <ClCompile Include="lgc.c" />
     <ClCompile Include="libcard.cpp" />
     <ClCompile Include="libdebug.cpp" />
     <ClCompile Include="libduel.cpp" />
     <ClCompile Include="libeffect.cpp" />
     <ClCompile Include="libgroup.cpp" />
-    <ClCompile Include="linit.c" />
-    <ClCompile Include="liolib.c" />
-    <ClCompile Include="llex.c" />
-    <ClCompile Include="lmathlib.c" />
-    <ClCompile Include="lmem.c" />
-    <ClCompile Include="loadlib.c" />
-    <ClCompile Include="lobject.c" />
-    <ClCompile Include="lopcodes.c" />
-    <ClCompile Include="loslib.c" />
-    <ClCompile Include="lparser.c" />
-    <ClCompile Include="lstate.c" />
-    <ClCompile Include="lstring.c" />
-    <ClCompile Include="lstrlib.c" />
-    <ClCompile Include="ltable.c" />
-    <ClCompile Include="ltablib.c" />
-    <ClCompile Include="ltm.c" />
-    <ClCompile Include="lundump.c" />
-    <ClCompile Include="lvm.c" />
-    <ClCompile Include="lzio.c" />
     <ClCompile Include="mem.cpp" />
     <ClCompile Include="ocgapi.cpp" />
     <ClCompile Include="operations.cpp" />
     <ClCompile Include="playerop.cpp" />
     <ClCompile Include="processor.cpp" />
     <ClCompile Include="scriptlib.cpp" />
-    <ClCompile Include="sqlite3.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="lua\lapi.h" />
+    <ClInclude Include="lua\lauxlib.h" />
+    <ClInclude Include="lua\lcode.h" />
+    <ClInclude Include="lua\lctype.h" />
+    <ClInclude Include="lua\ldebug.h" />
+    <ClInclude Include="lua\ldo.h" />
+    <ClInclude Include="lua\lfunc.h" />
+    <ClInclude Include="lua\lgc.h" />
+    <ClInclude Include="lua\llex.h" />
+    <ClInclude Include="lua\llimits.h" />
+    <ClInclude Include="lua\lmem.h" />
+    <ClInclude Include="lua\lobject.h" />
+    <ClInclude Include="lua\lopcodes.h" />
+    <ClInclude Include="lua\lparser.h" />
+    <ClInclude Include="lua\lstate.h" />
+    <ClInclude Include="lua\lstring.h" />
+    <ClInclude Include="lua\ltable.h" />
+    <ClInclude Include="lua\ltm.h" />
+    <ClInclude Include="lua\lua.h" />
+    <ClInclude Include="lua\luaconf.h" />
+    <ClInclude Include="lua\lualib.h" />
+    <ClInclude Include="lua\lundump.h" />
+    <ClInclude Include="lua\lvm.h" />
+    <ClInclude Include="lua\lzio.h" />
+    <ClInclude Include="sqlite3\sqlite3.h" />
     <ClInclude Include="card.h" />
     <ClInclude Include="common.h" />
     <ClInclude Include="duel.h" />
@@ -189,34 +225,9 @@
     <ClInclude Include="field.h" />
     <ClInclude Include="group.h" />
     <ClInclude Include="interpreter.h" />
-    <ClInclude Include="lapi.h" />
-    <ClInclude Include="lauxlib.h" />
-    <ClInclude Include="lcode.h" />
-    <ClInclude Include="lctype.h" />
-    <ClInclude Include="ldebug.h" />
-    <ClInclude Include="ldo.h" />
-    <ClInclude Include="lfunc.h" />
-    <ClInclude Include="lgc.h" />
-    <ClInclude Include="llex.h" />
-    <ClInclude Include="llimits.h" />
-    <ClInclude Include="lmem.h" />
-    <ClInclude Include="lobject.h" />
-    <ClInclude Include="lopcodes.h" />
-    <ClInclude Include="lparser.h" />
-    <ClInclude Include="lstate.h" />
-    <ClInclude Include="lstring.h" />
-    <ClInclude Include="ltable.h" />
-    <ClInclude Include="ltm.h" />
-    <ClInclude Include="lua.h" />
-    <ClInclude Include="luaconf.h" />
-    <ClInclude Include="lualib.h" />
-    <ClInclude Include="lundump.h" />
-    <ClInclude Include="lvm.h" />
-    <ClInclude Include="lzio.h" />
     <ClInclude Include="mtrandom.h" />
     <ClInclude Include="ocgapi.h" />
     <ClInclude Include="scriptlib.h" />
-    <ClInclude Include="sqlite3.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="LICENSE" />

AI_core_vs2017solution/ocgcore/ocgcore.vcxproj.user

 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommand>D:\yugioh\ygopro2.exe</LocalDebuggerCommand>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommand>D:\yugioh\ygopro2.exe</LocalDebuggerCommand>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommand>D:\yugioh\ygopro2.exe</LocalDebuggerCommand>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerCommand>D:\yugioh\ygopro2.exe</LocalDebuggerCommand>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
+  <PropertyGroup />
 </Project>
\ No newline at end of file