Changeset 3032 for trunk/include/pdwin32.tools

Timestamp:

Mar 7, 2000, 12:42:12 AM (25 years ago)

Author:

bird

Message:

Makefiles are updated to new style.

File:

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

trunk/include/pdwin32.tools

@@ -1 @@
-# $Id: pdwin32.tools,v 1.8 2000-03-04 23:45:30 sandervl Exp $
+# $Id: pdwin32.tools,v 1.9 2000-03-06 23:42:12 bird Exp $
 # ODIN / win32os2 Project
 #
@@ -17 +17 @@
 ECHO        = echo
 IMPDEF      = $(PDWIN32_TOOLS)\impdef.exe
+DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe -o$$(OBJDIR)
 #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 
+!ifdef OLDBUILD
+DEPEND      = $(PDWIN32_TOOLS)\fastdep.exe
 !endif
 
@@ -40 +39 @@
 # Targets
 #
+.SUFFIXES: .orc
+
 .c{$(OBJDIR)}.obj:
     $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
@@ -49 +50 @@
     $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
 
+.orc{$(OBJDIR)}.asm:
+    $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).asm $<
 
+.orc{$(OBJDIR)}.obj:
+    $(RC) $(RCFLAGS) -o $(OBJDIR)\$(@B).asm $<
+    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(OBJDIR)\$(@B).asm
+
+.rc{$(OBJDIR)}.res:
+    $(OS2RC) $(OS2RCFLAGS) $< $@
+
+
+#
+# Old Targets
+#
 .c.obj:
     $(CC) $(CFLAGS) -c $<
@@ -59 +73 @@
     $(AS) $(ASFLAGS) $<
 
+.orc.asm:
+    $(RC) $(RCFLAGS) -o $@ $<
 
+.rc.res:
+    $(OS2RC) $(OS2RCFLAGS) $< $@
+