Changeset 3019 for trunk/include/pdwin32.tools

Timestamp:

Mar 5, 2000, 12:47:19 AM (25 years ago)

Author:

sandervl

Message:

makefile rule changes

File:

• trunk/include/pdwin32.tools (modified) (4 diffs)

trunk/include/pdwin32.tools

@@ -1 @@
-# $Id: pdwin32.tools,v 1.7 2000-02-26 18:29:37 bird Exp $
+# $Id: pdwin32.tools,v 1.8 2000-03-04 23:45:30 sandervl Exp $
 # ODIN / win32os2 Project
 #
@@ -17 +17 @@
 ECHO        = echo
 IMPDEF      = $(PDWIN32_TOOLS)\impdef.exe
-DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe
+#SvL: Remove this when everything has been converted to the new build rules
+!ifdef NEWBUILD
+DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe -o$$(OBJDIR)
+!else
+DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe 
+!endif
+
 DOWITHDIRS  = $(PDWIN32_TOOLS)\dowithdirs.cmd
 MAKE_CMD    = nmake /nologo
@@ -34 +40 @@
 # Targets
 #
+.c{$(OBJDIR)}.obj:
+    $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
+
+.cpp{$(OBJDIR)}.obj:
+    $(CXX) $(CXXFLAGS) -Fo$(OBJDIR)\$(@B).obj -c $<
+
+.asm{$(OBJDIR)}.obj:
+    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
+
+
 .c.obj:
     $(CC) $(CFLAGS) -c $<
@@ -44 +60 @@
 
 
-