Changeset 9831 for ps

Timestamp:

07/15/11 20:51:18 (13 years ago)

Author:

philip

Message:

Fix Makefile dependency generation.
Fix PCH dependency to work with parallel builds.

File:

• ps/trunk/build/premake/premake4/src/actions/make/make_cpp.lua (modified) (2 diffs)

ps/trunk/build/premake/premake4/src/actions/make/make_cpp.lua

@@ -64 +64 @@
 
         -- target build rule
-        _p('$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES) | prelink')
+        _p('$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES) | prelink')
         _p('\t@echo Linking %s', prj.name)
         _p('\t$(SILENT) $(LINKCMD)')
@@ -112 +112 @@
         for _, file in ipairs(prj.files) do
             if path.iscppfile(file) then
-                _p('$(OBJDIR)/%s.o: %s | prebuild', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))
+                _p('$(OBJDIR)/%s.o: %s $(GCH) | prebuild', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))
                 _p('\t@echo $(notdir $<)')
                 if (path.iscfile(file)) then
-                    _p('\t$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"')
+                    _p('\t$(SILENT) $(CC) $(CFLAGS) -MF $(OBJDIR)/%s.d -MT "$@" -o "$@" -c "$<"', _MAKE.esc(path.getbasename(file)))
                 else
-                    _p('\t$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"')
+                    _p('\t$(SILENT) $(CXX) $(CXXFLAGS) -MF $(OBJDIR)/%s.d -MT "$@" -o "$@" -c "$<"', _MAKE.esc(path.getbasename(file)))
                 end
             elseif (path.getextension(file) == ".rc") then