diff --git a/build/premake/premake4/build/gmake.unix/Premake4.make b/build/premake/premake4/build/gmake.unix/Premake4.make index 287512a861..6c79d47ca3 100644 --- a/build/premake/premake4/build/gmake.unix/Premake4.make +++ b/build/premake/premake4/build/gmake.unix/Premake4.make @@ -26,13 +26,13 @@ ifeq ($(config),release) DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN INCLUDES += -I../../src/host/lua-5.1.4/src CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os + CFLAGS += $(CPPFLAGS) -Wall -Os CXXFLAGS += $(CFLAGS) LDFLAGS += -s -rdynamic - LIBS += -lm -ldl + LIBS += -lm -ldl RESFLAGS += $(DEFINES) $(INCLUDES) LDDEPS += - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) -Xlinker --start-group $(LDDEPS) -Xlinker --end-group $(LIBS) define PREBUILDCMDS endef define PRELINKCMDS @@ -48,13 +48,13 @@ ifeq ($(config),debug) DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN INCLUDES += -I../../src/host/lua-5.1.4/src CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -g + CFLAGS += $(CPPFLAGS) -Wall -g CXXFLAGS += $(CFLAGS) LDFLAGS += -rdynamic - LIBS += -lm -ldl + LIBS += -lm -ldl RESFLAGS += $(DEFINES) $(INCLUDES) LDDEPS += - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) -Xlinker --start-group $(LDDEPS) -Xlinker --end-group $(LIBS) define PREBUILDCMDS endef define PRELINKCMDS @@ -120,10 +120,10 @@ endif .PHONY: clean prebuild prelink -all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET) +all: $(TARGET) @: -$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES) +$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES) | prelink @echo Linking Premake4 $(SILENT) $(LINKCMD) $(POSTBUILDCMDS) @@ -154,147 +154,148 @@ else $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) endif -prebuild: +prebuild: $(TARGETDIR) $(OBJDIR) $(PREBUILDCMDS) prelink: $(PRELINKCMDS) ifneq (,$(PCH)) -$(GCH): $(PCH) +$(GCH): $(PCH) | $(OBJDIR) @echo $(notdir $<) -$(SILENT) cp $< $(OBJDIR) $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" endif -$(OBJDIR)/os_getcwd.o: ../../src/host/os_getcwd.c +$(OBJDIR)/os_getcwd.o: ../../src/host/os_getcwd.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/path_isabsolute.o: ../../src/host/path_isabsolute.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_getcwd.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/path_isabsolute.o: ../../src/host/path_isabsolute.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_isdir.o: ../../src/host/os_isdir.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/path_isabsolute.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_isdir.o: ../../src/host/os_isdir.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_rmdir.o: ../../src/host/os_rmdir.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_isdir.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_rmdir.o: ../../src/host/os_rmdir.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_chdir.o: ../../src/host/os_chdir.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_rmdir.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_chdir.o: ../../src/host/os_chdir.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_uuid.o: ../../src/host/os_uuid.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_chdir.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_uuid.o: ../../src/host/os_uuid.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_isfile.o: ../../src/host/os_isfile.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_uuid.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_isfile.o: ../../src/host/os_isfile.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_match.o: ../../src/host/os_match.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_isfile.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_match.o: ../../src/host/os_match.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_pathsearch.o: ../../src/host/os_pathsearch.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_match.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_pathsearch.o: ../../src/host/os_pathsearch.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_copyfile.o: ../../src/host/os_copyfile.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_pathsearch.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_copyfile.o: ../../src/host/os_copyfile.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/os_mkdir.o: ../../src/host/os_mkdir.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_copyfile.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/os_mkdir.o: ../../src/host/os_mkdir.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/premake.o: ../../src/host/premake.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/os_mkdir.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/premake.o: ../../src/host/premake.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/string_endswith.o: ../../src/host/string_endswith.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/premake.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/string_endswith.o: ../../src/host/string_endswith.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/scripts.o: ../../src/host/scripts.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/string_endswith.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/scripts.o: ../../src/host/scripts.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/liolib.o: ../../src/host/lua-5.1.4/src/liolib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/scripts.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/liolib.o: ../../src/host/lua-5.1.4/src/liolib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ltm.o: ../../src/host/lua-5.1.4/src/ltm.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/liolib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/ltm.o: ../../src/host/lua-5.1.4/src/ltm.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/linit.o: ../../src/host/lua-5.1.4/src/linit.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltm.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/linit.o: ../../src/host/lua-5.1.4/src/linit.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/loadlib.o: ../../src/host/lua-5.1.4/src/loadlib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/linit.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/loadlib.o: ../../src/host/lua-5.1.4/src/loadlib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lgc.o: ../../src/host/lua-5.1.4/src/lgc.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/loadlib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lgc.o: ../../src/host/lua-5.1.4/src/lgc.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lstate.o: ../../src/host/lua-5.1.4/src/lstate.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lgc.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lstate.o: ../../src/host/lua-5.1.4/src/lstate.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/llex.o: ../../src/host/lua-5.1.4/src/llex.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstate.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/llex.o: ../../src/host/lua-5.1.4/src/llex.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lstrlib.o: ../../src/host/lua-5.1.4/src/lstrlib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/llex.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lstrlib.o: ../../src/host/lua-5.1.4/src/lstrlib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lmem.o: ../../src/host/lua-5.1.4/src/lmem.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstrlib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lmem.o: ../../src/host/lua-5.1.4/src/lmem.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lopcodes.o: ../../src/host/lua-5.1.4/src/lopcodes.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lmem.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lopcodes.o: ../../src/host/lua-5.1.4/src/lopcodes.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldump.o: ../../src/host/lua-5.1.4/src/ldump.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lopcodes.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/ldump.o: ../../src/host/lua-5.1.4/src/ldump.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lmathlib.o: ../../src/host/lua-5.1.4/src/lmathlib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldump.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lmathlib.o: ../../src/host/lua-5.1.4/src/lmathlib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldo.o: ../../src/host/lua-5.1.4/src/ldo.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lmathlib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/ldo.o: ../../src/host/lua-5.1.4/src/ldo.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ltablib.o: ../../src/host/lua-5.1.4/src/ltablib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldo.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/ltablib.o: ../../src/host/lua-5.1.4/src/ltablib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lparser.o: ../../src/host/lua-5.1.4/src/lparser.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltablib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lparser.o: ../../src/host/lua-5.1.4/src/lparser.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lfunc.o: ../../src/host/lua-5.1.4/src/lfunc.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lparser.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lfunc.o: ../../src/host/lua-5.1.4/src/lfunc.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lobject.o: ../../src/host/lua-5.1.4/src/lobject.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lfunc.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lobject.o: ../../src/host/lua-5.1.4/src/lobject.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldebug.o: ../../src/host/lua-5.1.4/src/ldebug.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lobject.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/ldebug.o: ../../src/host/lua-5.1.4/src/ldebug.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ldblib.o: ../../src/host/lua-5.1.4/src/ldblib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldebug.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/ldblib.o: ../../src/host/lua-5.1.4/src/ldblib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/lauxlib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ldblib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lauxlib.o: ../../src/host/lua-5.1.4/src/lauxlib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lzio.o: ../../src/host/lua-5.1.4/src/lzio.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lzio.o: ../../src/host/lua-5.1.4/src/lzio.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/loslib.o: ../../src/host/lua-5.1.4/src/loslib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lzio.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/loslib.o: ../../src/host/lua-5.1.4/src/loslib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lcode.o: ../../src/host/lua-5.1.4/src/lcode.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/loslib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lcode.o: ../../src/host/lua-5.1.4/src/lcode.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lapi.o: ../../src/host/lua-5.1.4/src/lapi.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lcode.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lapi.o: ../../src/host/lua-5.1.4/src/lapi.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ltable.o: ../../src/host/lua-5.1.4/src/ltable.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lapi.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/ltable.o: ../../src/host/lua-5.1.4/src/ltable.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lbaselib.o: ../../src/host/lua-5.1.4/src/lbaselib.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/ltable.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lbaselib.o: ../../src/host/lua-5.1.4/src/lbaselib.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lvm.o: ../../src/host/lua-5.1.4/src/lvm.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lbaselib.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lvm.o: ../../src/host/lua-5.1.4/src/lvm.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lstring.o: ../../src/host/lua-5.1.4/src/lstring.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lvm.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lstring.o: ../../src/host/lua-5.1.4/src/lstring.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" -$(OBJDIR)/lundump.o: ../../src/host/lua-5.1.4/src/lundump.c + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lstring.d -MT "$@" -o "$@" -c "$<" +$(OBJDIR)/lundump.o: ../../src/host/lua-5.1.4/src/lundump.c $(GCH) | prebuild @echo $(notdir $<) - $(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<" + $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lundump.d -MT "$@" -o "$@" -c "$<" -include $(OBJECTS:%.o=%.d) +-include $(GCH:%.h.gch=%.h.d) diff --git a/build/premake/premake4/src/actions/make/make_cpp.lua b/build/premake/premake4/src/actions/make/make_cpp.lua index 1e31c23438..d5716d3a3a 100644 --- a/build/premake/premake4/src/actions/make/make_cpp.lua +++ b/build/premake/premake4/src/actions/make/make_cpp.lua @@ -248,7 +248,7 @@ -- set up precompiled headers _.pchconfig(cfg) - _p(' CFLAGS += $(CPPFLAGS) $(ARCH) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " ")) + _p(' CFLAGS += $(CPPFLAGS) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " ")) _p(' CXXFLAGS += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), " ")) _p(' LDFLAGS += %s', table.concat(table.join(cc.getldflags(cfg), cfg.linkoptions, cc.getlibdirflags(cfg)), " ")) _p(' LIBS += %s %s', table.concat(cc.getlinkflags(cfg), " "), table.concat(cfg.gnuexternals, " ")) @@ -272,7 +272,7 @@ else lddeps = '-Xlinker --start-group $(LDDEPS) -Xlinker --end-group' end - _p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) %s $(LIBS)', + _p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) %s $(LIBS)', iif(cfg.language == "C", "CC", "CXX"), lddeps) end diff --git a/build/premake/premake4/src/host/scripts.c b/build/premake/premake4/src/host/scripts.c index e1287b5661..72db383222 100644 --- a/build/premake/premake4/src/host/scripts.c +++ b/build/premake/premake4/src/host/scripts.c @@ -148,10 +148,10 @@ const char* builtin_scripts[] = { "(TARGETDIR) $(OBJDIR)')\n_p('\\t$(PREBUILDCMDS)')\n_p('')\n_p('prelink:')\n_p('\\t$(PRELINKCMDS)')\n_p('')\n_.pchrules(prj)\nfor _, file in ipairs(prj.files) do\nif path.iscppfile(file) then\n_p('$(OBJDIR)/%s.o: %s $(GCH) | prebuild', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\n_p('\\t@echo $(notdir $<)')\nif (path.iscfile(file)) then\n_p('\\t$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/%s.d -MT \"$@\" -o \"$@\" -c \"$<\"', _MAKE.esc(path.getbasename(file)))\nelse\n_p('\\t$(SILENT) $(CXX) $(PCHINCLUDES) $(CXXFLAGS) -MF $(OBJDIR)/%s.d -MT \"$@\" -o \"$@\" -c \"$<\"', _MAKE.esc(path.getbasename(file)))\nend\nelseif (path.getextension(file) == \".rc\") then\n_p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\n_p('\\t@echo $(notdir $<)')\n_p('\\t$(SILENT) windres $< -O coff -o \"$@\" $(RESFLAGS)')\nelseif (path.getextension(file) == \".asm\") then\n_p('$(OBJDIR)/%s.o: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\n_p('\\t@echo $(notdir $<)')\nlocal opts = '" "'\nif os.is('windows') then\nopts = ''\nelseif os.is('macosx') then\nopts = '-D OS_UNIX=1'\nelse\nopts = '-D DONT_USE_UNDERLINE=1 -D OS_UNIX=1'\nend\nif not (prj.solution.nasmpath) then\nprj.solution.nasmpath = 'nasm'\nend\n_p('\\t$(SILENT)'.._MAKE.esc(prj.solution.nasmpath)..' '..opts..' -i'.._MAKE.esc(path.getdirectory(file))..'/'..' -f '..\n _MAKE.esc(prj.solution.nasmformat)..' -o $@ $<\\n\\t')\n_p('\\t$(SILENT)'.._MAKE.esc(prj.solution.nasmpath)..' '..opts..' -i'.._MAKE.esc(path.getdirectory(file))..'/'..\n ' -M -o $@ $< >$(OBJDIR)/$( 0 then\n_p('\\t@echo Running pre-build commands'" - ")\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define PRELINKCMDS')\nif #cfg.prelinkcommands > 0 then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-build commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p('endif')\n_p('')\nend\nfunction _.pchconfig(cfg)\nif not cfg.flags.NoPCH and cfg.pchheader then\n_p(' PCH = %s', _MAKE.esc(cfg.pchheader))\n_p(' GCH = $(OBJDIR)/%s.gch', _MAKE.esc(path.getname(cfg.pchheader))) \n_p(' PCHINCLUDES = -I$(OBJDIR) -include $(OBJDIR)/%s', _MAKE.esc(path.getname(cfg.pchheader)))\nend\nend\nfunction _.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH) | $(OBJDIR)')\n_p('\\t@echo $(notdir $<)')\n_p('\\t-$(SILENT) cp $< $(OBJDIR)')\nif prj.language == \"C\" then\n_p('\\t$" - "(SILENT) $(CC) $(CFLAGS) -o \"$@\" -c \"$<\"')\nelse\n_p('\\t$(SILENT) $(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"')\nend\n_p('endif')\n_p('')\nend\n", + "al platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p(' CC = %s', platform.cc)\nend\nif platform.cxx then\n_p(' CXX = %s', platform.cxx)\nend\nif platform.ar then\n_p(' AR = %s', platform.ar)\nend\nif not(cfg.gnuexternals) then\ncfg.gnuexternal = { }\nend \n_p(' OBJDIR = %s', _MAKE.esc(cfg.objectsdir))\n_p(' TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p(' TARGET = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p(' DEFINES += %s', table.concat(cc.getdefines(cfg.defines), \" \"))\n_p(' INCLUDES += %s', table.concat(cc.getincludedirs(cfg.includedirs), \" \"))\n_p(' CPPFLAGS += %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_.pchconfig(cfg)\n_p(' CFLAGS += $(CPPFLAGS) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), \" \"))\n_p(' CXXFLAGS += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), \" \"))\n_p(' LDFLAGS += %s', table.concat(table.join(cc.getldflags(cfg), cfg.linkoptions, cc.getlibd" + "irflags(cfg)), \" \"))\n_p(' LIBS += %s %s', table.concat(cc.getlinkflags(cfg), \" \"), table.concat(cfg.gnuexternals, \" \"))\n_p(' RESFLAGS += $(DEFINES) $(INCLUDES) %s', table.concat(table.join(cc.getdefines(cfg.resdefines), cc.getincludedirs(cfg.resincludedirs), cfg.resoptions), \" \"))\n_p(' LDDEPS += %s', table.concat(_MAKE.esc(premake.getlinks(cfg, \"static\", \"fullpath\")), \" \"))\nif cfg.kind == \"StaticLib\" then\nif cfg.platform:startswith(\"Universal\") then\n_p(' LINKCMD = libtool -o $(TARGET) $(OBJECTS)')\nelse\n_p(' LINKCMD = $(AR) -rcs $(TARGET) $(OBJECTS)')\nend\nelse\nlocal lddeps = ''\nif os.is('macosx') then\nlddeps = '$(LDDEPS)'\nelse\nlddeps = '-Xlinker --start-group $(LDDEPS) -Xlinker --end-group'\nend\n_p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) %s $(LIBS)', \niif(cfg.language == \"C\", \"CC\", \"CXX\"), lddeps)\nend\n_p(' define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo Running pre-build commands')\n_p('\\t%s', t" + "able.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define PRELINKCMDS')\nif #cfg.prelinkcommands > 0 then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-build commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p('endif')\n_p('')\nend\nfunction _.pchconfig(cfg)\nif not cfg.flags.NoPCH and cfg.pchheader then\n_p(' PCH = %s', _MAKE.esc(cfg.pchheader))\n_p(' GCH = $(OBJDIR)/%s.gch', _MAKE.esc(path.getname(cfg.pchheader))) \n_p(' PCHINCLUDES = -I$(OBJDIR) -include $(OBJDIR)/%s', _MAKE.esc(path.getname(cfg.pchheader)))\nend\nend\nfunction _.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH) | $(OBJDIR)')\n_p('\\t@echo $(notdir $<)')\n_p('\\t-$(SILENT) cp $< $(OBJDIR)')\nif prj.language == \"C\" then\n_p('\\t$(SILENT) $(CC) $" + "(CFLAGS) -o \"$@\" -c \"$<\"')\nelse\n_p('\\t$(SILENT) $(CXX) $(CXXFLAGS) -o \"$@\" -c \"$<\"')\nend\n_p('endif')\n_p('')\nend\n", /* actions/make/make_csharp.lua */ "local function getresourcefilename(cfg, fname)\nif path.getextension(fname) == \".resx\" then\n local name = cfg.buildtarget.basename .. \".\"\n local dir = path.getdirectory(fname)\n if dir ~= \".\" then \nname = name .. path.translate(dir, \".\") .. \".\"\nend\nreturn \"$(OBJDIR)/\" .. _MAKE.esc(name .. path.getbasename(fname)) .. \".resources\"\nelse\nreturn fname\nend\nend\nfunction premake.make_csharp(prj)\nlocal csc = premake.dotnet\nlocal cfglibs = { }\nlocal cfgpairs = { }\nlocal anycfg\nfor cfg in premake.eachconfig(prj) do\nanycfg = cfg\ncfglibs[cfg] = premake.getlinks(cfg, \"siblings\", \"fullpath\")\ncfgpairs[cfg] = { }\nfor _, fname in ipairs(cfglibs[cfg]) do\nif path.getdirectory(fname) ~= cfg.buildtarget.directory then\ncfgpairs[cfg][\"$(TARGETDIR)/\" .. _MAKE.esc(path.getname(fname))] = _MAKE.esc(fname)\nend\nend\nend\nlocal sources = {}\nlocal embedded = { }\nlocal copypairs = { }\nfor fcfg in premake.eachfile(prj) do\nlocal action = csc.getbuildaction(fcfg)\nif action == \"Compile\" "