genie-1170-system-lua.patch (13655B)
- diff --git a/build/gmake.linux/genie.make.old b/build/gmake.linux/genie.make
- index 371360e..28aea12 100644
- --- a/build/gmake.linux/genie.make.old
- +++ b/build/gmake.linux/genie.make
- @@ -50,7 +50,7 @@ ifeq ($(config),release)
- TARGETDIR = ../../bin/linux
- override TARGET = $(TARGETDIR)/genie
- DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_FILE_OFFSET_BITS=64
- - INCLUDES += -I"../../src/host/lua-5.3.0/src"
- + INCLUDES += `pkg-config --cflags lua`
- ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
- ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -Wno-implicit-fallthrough
- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -Wno-implicit-fallthrough
- @@ -60,7 +60,7 @@ ifeq ($(config),release)
- ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
- - ALL_LDFLAGS += $(LDFLAGS) -L"." -s -rdynamic
- + ALL_LDFLAGS += $(LDFLAGS) -L"." -rdynamic
- LIBDEPS +=
- - LDDEPS +=
- + LDDEPS += `pkg-config --libs lua`
- LDRESP =
- LIBS += $(LDDEPS) -ldl -lm
- EXTERNAL_LIBS +=
- @@ -68,39 +68,6 @@ ifeq ($(config),release)
- LINKCMD = $(CC) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
- OBJRESP =
- OBJECTS := \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lbaselib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lbitlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lcode.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lcorolib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lctype.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldblib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldebug.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldo.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldump.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lfunc.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lgc.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/linit.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/liolib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/llex.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lmathlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lmem.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/loadlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lobject.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lopcodes.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/loslib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lparser.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lstate.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lstring.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lstrlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ltable.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ltablib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ltm.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lundump.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lutf8lib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lvm.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lzio.o \
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- @@ -137,7 +104,7 @@ ifeq ($(config),debug)
- TARGETDIR = ../../bin/linux
- override TARGET = $(TARGETDIR)/genie
- DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_FILE_OFFSET_BITS=64
- - INCLUDES += -I"../../src/host/lua-5.3.0/src"
- + INCLUDES += `pkg-config --cflags lua`
- ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
- ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -m64 -Wno-implicit-fallthrough
- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -m64 -Wno-implicit-fallthrough
- @@ -147,7 +114,7 @@ ifeq ($(config),debug)
- ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
- ALL_LDFLAGS += $(LDFLAGS) -L"." -rdynamic
- LIBDEPS +=
- - LDDEPS +=
- + LDDEPS += `pkg-config --libs lua`
- LDRESP =
- LIBS += $(LDDEPS) -ldl -lm
- EXTERNAL_LIBS +=
- @@ -155,39 +122,6 @@ ifeq ($(config),debug)
- LINKCMD = $(CC) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
- OBJRESP =
- OBJECTS := \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lbaselib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lbitlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lcode.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lcorolib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lctype.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldblib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldebug.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldo.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ldump.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lfunc.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lgc.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/linit.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/liolib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/llex.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lmathlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lmem.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/loadlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lobject.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lopcodes.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/loslib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lparser.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lstate.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lstring.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lstrlib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ltable.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ltablib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/ltm.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lundump.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lutf8lib.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lvm.o \
- - $(OBJDIR)/src/host/lua-5.3.0/src/lzio.o \
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- @@ -222,7 +156,6 @@ endif
- OBJDIRS := \
- $(OBJDIR) \
- $(OBJDIR)/src/host \
- - $(OBJDIR)/src/host/lua-5.3.0/src \
- RESOURCES := \
- @@ -282,138 +215,6 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
- $(SILENT) echo $^ > $@
- endif
- -$(OBJDIR)/src/host/lua-5.3.0/src/lapi.o: ../../src/host/lua-5.3.0/src/lapi.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o: ../../src/host/lua-5.3.0/src/lauxlib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lbaselib.o: ../../src/host/lua-5.3.0/src/lbaselib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lbitlib.o: ../../src/host/lua-5.3.0/src/lbitlib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lcode.o: ../../src/host/lua-5.3.0/src/lcode.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lcorolib.o: ../../src/host/lua-5.3.0/src/lcorolib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lctype.o: ../../src/host/lua-5.3.0/src/lctype.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/ldblib.o: ../../src/host/lua-5.3.0/src/ldblib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/ldebug.o: ../../src/host/lua-5.3.0/src/ldebug.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/ldo.o: ../../src/host/lua-5.3.0/src/ldo.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/ldump.o: ../../src/host/lua-5.3.0/src/ldump.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lfunc.o: ../../src/host/lua-5.3.0/src/lfunc.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lgc.o: ../../src/host/lua-5.3.0/src/lgc.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/linit.o: ../../src/host/lua-5.3.0/src/linit.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/liolib.o: ../../src/host/lua-5.3.0/src/liolib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/llex.o: ../../src/host/lua-5.3.0/src/llex.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lmathlib.o: ../../src/host/lua-5.3.0/src/lmathlib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lmem.o: ../../src/host/lua-5.3.0/src/lmem.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/loadlib.o: ../../src/host/lua-5.3.0/src/loadlib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lobject.o: ../../src/host/lua-5.3.0/src/lobject.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lopcodes.o: ../../src/host/lua-5.3.0/src/lopcodes.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/loslib.o: ../../src/host/lua-5.3.0/src/loslib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lparser.o: ../../src/host/lua-5.3.0/src/lparser.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lstate.o: ../../src/host/lua-5.3.0/src/lstate.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lstring.o: ../../src/host/lua-5.3.0/src/lstring.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lstrlib.o: ../../src/host/lua-5.3.0/src/lstrlib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/ltable.o: ../../src/host/lua-5.3.0/src/ltable.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/ltablib.o: ../../src/host/lua-5.3.0/src/ltablib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/ltm.o: ../../src/host/lua-5.3.0/src/ltm.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lundump.o: ../../src/host/lua-5.3.0/src/lundump.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lutf8lib.o: ../../src/host/lua-5.3.0/src/lutf8lib.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lvm.o: ../../src/host/lua-5.3.0/src/lvm.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- -$(OBJDIR)/src/host/lua-5.3.0/src/lzio.o: ../../src/host/lua-5.3.0/src/lzio.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host/lua-5.3.0/src
- - @echo $(notdir $<)
- - $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
- -
- $(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c $(GCH) $(MAKEFILE) | $(OBJDIR)/src/host
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"