Changeset 6541 for trunk/include
- Timestamp:
- Aug 16, 2001, 6:13:21 AM (24 years ago)
- Location:
- trunk/include
- Files:
-
- 4 edited
-
odin32.post.vac3.mk (modified) (4 diffs)
-
odin32.tools.emx.mk (modified) (4 diffs)
-
odin32.tools.mk (modified) (3 diffs)
-
odin32.tools.vac3.mk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/odin32.post.vac3.mk
r6449 r6541 1 # $Id: odin32.post.vac3.mk,v 1.1 6 2001-08-04 14:18:23bird Exp $1 # $Id: odin32.post.vac3.mk,v 1.17 2001-08-16 04:13:20 bird Exp $ 2 2 3 3 # … … 129 129 !ifndef NO_MAIN_RULE 130 130 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf 131 $(CMDQD_WAIT) 131 132 -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf 132 133 !ifdef OS2RES … … 200 201 !ifndef NO_MAIN_RULE 201 202 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(LIBS) $(OBJS) $(OS2RES) $(DEFFILE) $(OBJDIR)\bldlevel.$(DEFFILE) $(OBJDIR)\$(TARGET).lrf 203 $(CMDQD_WAIT) 202 204 -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf 203 205 !ifdef OS2RES … … 295 297 !ifndef NO_MAIN_RULE 296 298 $(OBJDIR)\$(TARGET).$(TARGET_EXTENSION): $(OBJS) 299 $(CMDQD_WAIT) 297 300 $(RM) $@ 298 301 !if "$(CCENV)" != "EMX" -
trunk/include/odin32.tools.emx.mk
r6106 r6541 1 # $Id: odin32.tools.emx.mk,v 1. 3 2001-06-25 23:41:25bird Exp $1 # $Id: odin32.tools.emx.mk,v 1.4 2001-08-16 04:13:20 bird Exp $ 2 2 3 3 # … … 39 39 .c{$(OBJDIR)}.obj: 40 40 !ifdef USERAPP 41 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<41 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $< 42 42 !else 43 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<43 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $< 44 44 !endif 45 45 46 46 .c.obj: 47 47 !ifdef USERAPP 48 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<48 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $< 49 49 !else 50 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<50 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $< 51 51 !endif 52 52 53 53 .c.pre-c: 54 54 !ifdef USERAPP 55 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -E -c $< > $@55 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -E -c $< > $@ 56 56 !else 57 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -E -c $< > $@57 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -E -c $< > $@ 58 58 !endif 59 59 … … 61 61 .cpp{$(OBJDIR)}.obj: 62 62 !ifdef USERAPP 63 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<63 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $< 64 64 !else 65 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<65 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $< 66 66 !endif 67 67 68 68 .cpp.obj: 69 69 !ifdef USERAPP 70 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $<70 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -o$(OBJDIR)\$(@B).obj -c $< 71 71 !else 72 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $<72 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -o$(OBJDIR)\$(@B).obj -c $< 73 73 !endif 74 74 75 75 .cpp.pre-cpp: 76 76 !ifdef USERAPP 77 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -E -c $< > $@77 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -E -c $< > $@ 78 78 !else 79 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -E -c $< > $@79 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -E -c $< > $@ 80 80 !endif 81 81 82 82 83 83 .asm{$(OBJDIR)}.obj: 84 $( AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<84 $(CMDQD_SUB) $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $< 85 85 86 86 .orc{$(OBJDIR)}.orc_asm: 87 $( RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<87 $(CMDQD_SUB) $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $< 88 88 89 89 .orc{$(OBJDIR)}.obj: … … 92 92 93 93 .rc{$(OBJDIR)}.res: 94 $( OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@94 $(CMDQD_SUB) $(OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@ 95 95 -
trunk/include/odin32.tools.mk
r6402 r6541 1 # $Id: odin32.tools.mk,v 1. 5 2001-07-29 23:28:11 bird Exp $1 # $Id: odin32.tools.mk,v 1.6 2001-08-16 04:13:21 bird Exp $ 2 2 3 3 # … … 48 48 BLDLEVELINF = $(ODIN32_TOOLS)\BldLevelInf.cmd 49 49 LXLITE = $(ODIN32_TOOLS)\lxlite.exe 50 CMDQD = $(ODIN32_TOOLS)\cmdqd.exe 50 51 DEPEND = $(ODIN32_TOOLS)\fastdep.exe -o$$(OBJDIR) -cy+ 51 52 !ifdef MAKEFLAGS … … 61 62 !endif 62 63 64 !ifdef MULTIJOBS 65 !ifndef WAT 66 CMDQD_SUB = $(CMDQD) submit 67 CMDQD_WAIT = $(CMDQD) wait 68 CMDQD_INIT = $(CMDQD) kill & $(CMDQD) init $(MULTIJOBS) 69 !endif 70 !endif 71 63 72 64 73 # -
trunk/include/odin32.tools.vac3.mk
r6106 r6541 1 # $Id: odin32.tools.vac3.mk,v 1. 4 2001-06-25 23:41:26bird Exp $1 # $Id: odin32.tools.vac3.mk,v 1.5 2001-08-16 04:13:20 bird Exp $ 2 2 3 3 # … … 37 37 .SUFFIXES: .orc_asm .orc .pre-c .pre-cpp 38 38 39 !ifdef MULTIJOBS 40 .SILENT : 41 !endif 42 39 43 .c{$(OBJDIR)}.obj: 40 44 !ifdef USERAPP 41 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<45 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $< 42 46 !else 43 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<47 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $< 44 48 !endif 45 49 46 50 .c.obj: 47 51 !ifdef USERAPP 48 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<52 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $< 49 53 !else 50 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<54 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $< 51 55 !endif 52 56 53 57 .c.pre-c: 54 58 !ifdef USERAPP 55 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@59 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@ 56 60 !else 57 $(C C) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@61 $(CMDQD_SUB) $(CC) $(CFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@ 58 62 !endif 59 63 … … 61 65 .cpp{$(OBJDIR)}.obj: 62 66 !ifdef USERAPP 63 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<67 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $< 64 68 !else 65 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<69 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $< 66 70 !endif 67 71 68 72 .cpp.obj: 69 73 !ifdef USERAPP 70 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $<74 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -Fo$(OBJDIR)\$(@B).obj -c $< 71 75 !else 72 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $<76 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -Fo$(OBJDIR)\$(@B).obj -c $< 73 77 !endif 74 78 75 79 .cpp.pre-cpp: 76 80 !ifdef USERAPP 77 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@81 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES_WIN32APP) -P+ -Pd -Pc+ -c $< > $@ 78 82 !else 79 $(C XX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@83 $(CMDQD_SUB) $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -P+ -Pd -Pc+ -c $< > $@ 80 84 !endif 81 85 82 86 83 87 .asm{$(OBJDIR)}.obj: 84 $( AS) $(ASFLAGS) -Fdo:$(OBJDIR) $<88 $(CMDQD_SUB) $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $< 85 89 86 90 .orc{$(OBJDIR)}.orc_asm: 87 $( RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $<91 $(CMDQD_SUB) $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $< 88 92 89 93 .orc{$(OBJDIR)}.obj: 90 94 $(RC) $(RCFLAGS) $(CINCLUDES) -o $(OBJDIR)\$(@B).orc_asm $< 91 $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(OBJDIR)\$(@B).orc_asm 95 $(AS) $(ASFLAGS) -Fdo:$(OBJDIR) $(OBJDIR)\$(@B).orc_asm" 92 96 93 97 .rc{$(OBJDIR)}.res: 94 $( OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@98 $(CMDQD_SUB) $(OS2RC) $(OS2RCFLAGS) $(CINCLUDES:-I=-i ) $< $@ 95 99 96 100 … … 114 118 $(OS2RC) $(OS2RCFLAGS) $< $@ 115 119 !endif 120
Note:
See TracChangeset
for help on using the changeset viewer.
