--- build/gmake.unix/Premake4.make.orig 2010-11-23 16:52:42.500225376 +0100 +++ build/gmake.unix/Premake4.make 2010-11-23 16:55:27.576984010 +0100 @@ -24,12 +24,12 @@ TARGETDIR = ../../bin/release TARGET = $(TARGETDIR)/premake4 DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN - INCLUDES += -I../../src/host/lua-5.1.4/src + INCLUDES += -I/usr/include/lua-5.1 CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os CXXFLAGS += $(CFLAGS) LDFLAGS += -s -rdynamic - LIBS += -lm -ldl + LIBS += -lm -ldl -llua-5.1 RESFLAGS += $(DEFINES) $(INCLUDES) LDDEPS += LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) @@ -46,12 +46,12 @@ TARGETDIR = ../../bin/debug TARGET = $(TARGETDIR)/premake4 DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN - INCLUDES += -I../../src/host/lua-5.1.4/src + INCLUDES += -I/usr/include/lua-5.1 CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -g CXXFLAGS += $(CFLAGS) LDFLAGS += -rdynamic - LIBS += -lm -ldl + LIBS += -lm -ldl -llua-5.1 RESFLAGS += $(DEFINES) $(INCLUDES) LDDEPS += LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) @@ -77,36 +77,7 @@ $(OBJDIR)/path_isabsolute.o \ $(OBJDIR)/premake.o \ $(OBJDIR)/scripts.o \ - $(OBJDIR)/string_endswith.o \ - $(OBJDIR)/lapi.o \ - $(OBJDIR)/lauxlib.o \ - $(OBJDIR)/lbaselib.o \ - $(OBJDIR)/lcode.o \ - $(OBJDIR)/ldblib.o \ - $(OBJDIR)/ldebug.o \ - $(OBJDIR)/ldo.o \ - $(OBJDIR)/ldump.o \ - $(OBJDIR)/lfunc.o \ - $(OBJDIR)/lgc.o \ - $(OBJDIR)/linit.o \ - $(OBJDIR)/liolib.o \ - $(OBJDIR)/llex.o \ - $(OBJDIR)/lmathlib.o \ - $(OBJDIR)/lmem.o \ - $(OBJDIR)/loadlib.o \ - $(OBJDIR)/lobject.o \ - $(OBJDIR)/lopcodes.o \ - $(OBJDIR)/loslib.o \ - $(OBJDIR)/lparser.o \ - $(OBJDIR)/lstate.o \ - $(OBJDIR)/lstring.o \ - $(OBJDIR)/lstrlib.o \ - $(OBJDIR)/ltable.o \ - $(OBJDIR)/ltablib.o \ - $(OBJDIR)/ltm.o \ - $(OBJDIR)/lundump.o \ - $(OBJDIR)/lvm.o \ - $(OBJDIR)/lzio.o \ + $(OBJDIR)/string_endswith.o RESOURCES := \ @@ -209,92 +180,5 @@ $(OBJDIR)/string_endswith.o: ../../src/host/string_endswith.c @echo $(notdir $<) $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lapi.o: ../../src/host/lua-5.1.4/src/lapi.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/lauxlib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lbaselib.o: ../../src/host/lua-5.1.4/src/lbaselib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lcode.o: ../../src/host/lua-5.1.4/src/lcode.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldblib.o: ../../src/host/lua-5.1.4/src/ldblib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldebug.o: ../../src/host/lua-5.1.4/src/ldebug.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldo.o: ../../src/host/lua-5.1.4/src/ldo.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldump.o: ../../src/host/lua-5.1.4/src/ldump.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lfunc.o: ../../src/host/lua-5.1.4/src/lfunc.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lgc.o: ../../src/host/lua-5.1.4/src/lgc.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/linit.o: ../../src/host/lua-5.1.4/src/linit.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/liolib.o: ../../src/host/lua-5.1.4/src/liolib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/llex.o: ../../src/host/lua-5.1.4/src/llex.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lmathlib.o: ../../src/host/lua-5.1.4/src/lmathlib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lmem.o: ../../src/host/lua-5.1.4/src/lmem.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/loadlib.o: ../../src/host/lua-5.1.4/src/loadlib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lobject.o: ../../src/host/lua-5.1.4/src/lobject.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lopcodes.o: ../../src/host/lua-5.1.4/src/lopcodes.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/loslib.o: ../../src/host/lua-5.1.4/src/loslib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lparser.o: ../../src/host/lua-5.1.4/src/lparser.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lstate.o: ../../src/host/lua-5.1.4/src/lstate.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lstring.o: ../../src/host/lua-5.1.4/src/lstring.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lstrlib.o: ../../src/host/lua-5.1.4/src/lstrlib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ltable.o: ../../src/host/lua-5.1.4/src/ltable.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ltablib.o: ../../src/host/lua-5.1.4/src/ltablib.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ltm.o: ../../src/host/lua-5.1.4/src/ltm.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lundump.o: ../../src/host/lua-5.1.4/src/lundump.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lvm.o: ../../src/host/lua-5.1.4/src/lvm.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lzio.o: ../../src/host/lua-5.1.4/src/lzio.c - @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -include $(OBJECTS:%.o=%.d)