Changeset 6877

Timestamp:

Sep 30, 2001, 2:49:58 AM (24 years ago)

Author:

bird

Message:

Synced with the VAC3 version.

File:

• trunk/include/odin32.tools.vac36.mk (modified) (4 diffs)

trunk/include/odin32.tools.vac36.mk ¶

@@ -1 @@
-# $Id: odin32.tools.vac36.mk,v 1.4 2001-06-25 23:41:26 bird Exp $
+# $Id: odin32.tools.vac36.mk,v 1.5 2001-09-30 00:49:58 bird Exp $
 
 #
@@ -36 +36 @@
 # Interference rules.
 #
-.SUFFIXES: .orc_asm .orc
+.SUFFIXES: .orc_asm .orc .pre-c .pre-cpp
+
+!ifdef MULTIJOBS
+.SILENT :
+!endif
 
 .c{$(OBJDIR)}.obj:
 !ifdef USERAPP
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
 !endif
 
 .c.obj:
 !ifdef USERAPP
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
 !endif
 
 .c.pre-c:
 !ifdef USERAPP
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@
 !else
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@
+    $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@
 !endif
 
@@ -62 +66 @@
 .cpp{$(OBJDIR)}.obj:
 !ifdef USERAPP
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
 !endif
 
 .cpp.obj:
 !ifdef USERAPP
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<
 !else
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<
 !endif
 
 .cpp.pre-cpp:
 !ifdef USERAPP
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@
 !else
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@
+    $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@
 !endif
 
 
 .asm{$(OBJDIR)}.obj:
-    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
+    $(CMDQD_SUB) $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
 
 .orc{$(OBJDIR)}.orc_asm:
-    $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<
+    $(CMDQD_SUB) $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<
 
 .orc{$(OBJDIR)}.obj:
@@ -93 +97 @@
 
 .rc{$(OBJDIR)}.res:
-    $(OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@
+    $(CMDQD_SUB) $(OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@
 
-
-!if 0 # disabled.
-#
-# Old Targets
-#
-.c.obj:
-    $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -c $<
-
-.cpp.obj:
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -c $<
-
-.asm.obj:
-    $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<
-
-.orc.asm:
-    $(RC) $(RCFLAGS) $(CINCLUDES) -o $@ $<
-
-.rc.res:
-    $(OS2RC) $(OS2RCFLAGS) $< $@
-!endif