Attachment #7457 for issue #13888

View | Details | Raw Unified | Return to issue 13888
Collapse All | Expand All




$(OBJ)$/%.obj : %.cxx
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
	@$(RM) $@ $(@:s/.obj/.o/)
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@

$(OBJ)$/%.obj : %.cpp
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
	@$(RM) $@ $(@:s/.obj/.o/)
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@

$(SLO)$/%.obj : %.cxx
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
.IF "$(TEST)"!=""
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE

$(SLO)$/%.obj : %.cpp
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
.IF "$(TEST)"!=""
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
.ELSE

$(SLO)$/%.obj : $(MISC)$/%.cxx
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
.IF "$(TEST)"!=""
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE

$(OBJ)$/%.obj : $(MISC)$/%.cxx
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
.IF "$(TEST)"!=""
	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
.ELSE

$(OBJ)$/%.obj : %.c
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
.IF "$(TEST)"!=""
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
.ELSE
	@$(RM) $@ $(@:s/.obj/.o/)
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ENDIF # "$(TEST)"!=""
.ELSE # "$(GUI)"=="UNX"
	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c )
	@+$(ECHONL)
.IF "$(COM)"=="GCC"
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c
.ELSE
	+-@echo Cflags: $(CFLAGS)
	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c )
.ENDIF
.ENDIF
.ENDIF # "$(GUI)"=="UNX"

$(OBJ)$/%.obj : $(MISCX)$/%.c
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
	@$(RM) $@ $(@:s/.obj/.o/)
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE # "$(GUI)"=="UNX"
	@+-$(RM) $@ >& nul
	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISCX)$/$*.c )
	@+$(ECHONL)
	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISCX)$/$*.c )
.ENDIF # "$(GUI)"=="UNX"

$(SLO)$/%.obj : $(MISCX)$/%.c
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
	@$(RM) $@ $(@:s/.obj/.o/)
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE # "$(GUI)"=="UNX"
	@+-$(RM) $@ >& nul
	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISCX)$/$*.c )
	@+$(ECHONL)
.IF "$(COM)"=="GCC"
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISCX)$/$*.c 
.ELSE
	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISCX)$/$*.c )
.ENDIF
.ENDIF
.ENDIF # "$(GUI)"=="UNX"

$(SLO)$/%.obj : %.c
	@echo ------------------------------
	@echo Making: $@
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
	@$(RM) $@ $(@:s/.obj/.o/)
	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
.ELSE # "$(GUI)"=="UNX"
	@+-$(RM) $@ >& nul
.IF "$(COM)"=="GCC"
	   $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
.ELSE
	   $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
.ENDIF
.ENDIF # "$(GUI)"=="UNX"

# Objective-C files
$(OBJ)$/%.obj : %.m

	@echo ------------------------------ $(noout)
	@echo Making: $@ $(noout)
	@+-$(RM) $@ >& $(NULLDEV)
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"	
	@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
.ELSE			# "$(GUI)"=="UNX"	
	@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@

	@echo ------------------------------ $(noout)
	@echo Making: $@ $(noout)
	@+-$(RM) $@ >& $(NULLDEV)
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"	
	@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
.ELSE			# "$(GUI)"=="UNX"	
	@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@

$(MISC)$/%.dpj :
	@+echo Making dpj...
.IF "$(nodep)"!=""
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
	@+echo > $@
.ELSE
	@+$(ECHONL) > $@
.ENDIF
.ELSE 			# "$(ndep)"==""
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
	@+echo $(shell +$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/:/ /) -i $i) $(JAVACLASSFILES)))
.ELSE
	@+echo $(shell +$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/;/ /) -i $i) $(JAVACLASSFILES)))

Return to issue 13888

Lines 65-71 Link Here

(-)solenv/inc/rules.mk (-32 / +32 lines)
65	$(OBJ)$/%.obj : %.cxx	65	$(OBJ)$/%.obj : %.cxx
66	@echo ------------------------------	66	@echo ------------------------------
67	@echo Making: $@	67	@echo Making: $@
68	.IF "$(GUI)"=="UNX"	68	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
69	@$(RM) $@ $(@:s/.obj/.o/)	69	@$(RM) $@ $(@:s/.obj/.o/)
70	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $(CFLAGSINCXX)$(PWD)$/$.cxx	70	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $(CFLAGSINCXX)$(PWD)$/$.cxx
71	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@	71	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
Lines 83-89 Link Here
83	$(OBJ)$/%.obj : %.cpp	83	$(OBJ)$/%.obj : %.cpp
84	@echo ------------------------------	84	@echo ------------------------------
85	@echo Making: $@	85	@echo Making: $@
86	.IF "$(GUI)"=="UNX"	86	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
87	@$(RM) $@ $(@:s/.obj/.o/)	87	@$(RM) $@ $(@:s/.obj/.o/)
88	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $(CFLAGSINCXX)$(PWD)$/$.cpp	88	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $(CFLAGSINCXX)$(PWD)$/$.cpp
89	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@	89	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
Lines 102-108 Link Here
102	$(SLO)$/%.obj : %.cxx	102	$(SLO)$/%.obj : %.cxx
103	@echo ------------------------------	103	@echo ------------------------------
104	@echo Making: $@	104	@echo Making: $@
105	.IF "$(GUI)"=="UNX"	105	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
106	.IF "$(TEST)"!=""	106	.IF "$(TEST)"!=""
107	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx	107	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
108	.ELSE	108	.ELSE
Lines 120-126 Link Here
120	$(SLO)$/%.obj : %.cpp	120	$(SLO)$/%.obj : %.cpp
121	@echo ------------------------------	121	@echo ------------------------------
122	@echo Making: $@	122	@echo Making: $@
123	.IF "$(GUI)"=="UNX"	123	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
124	.IF "$(TEST)"!=""	124	.IF "$(TEST)"!=""
125	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp	125	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp
126	.ELSE	126	.ELSE
Lines 138-144 Link Here
138	$(SLO)$/%.obj : $(MISC)$/%.cxx	138	$(SLO)$/%.obj : $(MISC)$/%.cxx
139	@echo ------------------------------	139	@echo ------------------------------
140	@echo Making: $@	140	@echo Making: $@
141	.IF "$(GUI)"=="UNX"	141	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
142	.IF "$(TEST)"!=""	142	.IF "$(TEST)"!=""
143	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx	143	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
144	.ELSE	144	.ELSE
Lines 155-161 Link Here
155	$(OBJ)$/%.obj : $(MISC)$/%.cxx	155	$(OBJ)$/%.obj : $(MISC)$/%.cxx
156	@echo ------------------------------	156	@echo ------------------------------
157	@echo Making: $@	157	@echo Making: $@
158	.IF "$(GUI)"=="UNX"	158	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
159	.IF "$(TEST)"!=""	159	.IF "$(TEST)"!=""
160	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx	160	$(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx
161	.ELSE	161	.ELSE
Lines 172-243 Link Here
172	$(OBJ)$/%.obj : %.c	172	$(OBJ)$/%.obj : %.c
173	@echo ------------------------------	173	@echo ------------------------------
174	@echo Making: $@	174	@echo Making: $@
175	.IF "$(GUI)"=="UNX"	175	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
176	.IF "$(TEST)"!=""	176	.IF "$(TEST)"!=""
177	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $.c	177	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $.c
178	.ELSE	178	.ELSE
179	@$(RM) $@ $(@:s/.obj/.o/)	179	@$(RM) $@ $(@:s/.obj/.o/)
180	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $.c	180	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $.c
181	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@	181	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
182	.ENDIF	182	.ENDIF # "$(TEST)"!=""
183	.ELSE	183	.ELSE # "$(GUI)"=="UNX"
184	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c )	184	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $.c )
185	@+$(ECHONL)	185	@+$(ECHONL)
186	.IF "$(COM)"=="GCC"	186	.IF "$(COM)"=="GCC"
187	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c	187	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $.c
188	.ELSE	188	.ELSE
189	+-@echo Cflags: $(CFLAGS)	189	+-@echo Cflags: $(CFLAGS)
190	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $.c )	190	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $.c )
191	.ENDIF
192	.ENDIF	191	.ENDIF
		192	.ENDIF # "$(GUI)"=="UNX"
193		193
194	$(OBJ)$/%.obj : $(MISCX)$/%.c	194	$(OBJ)$/%.obj : $(MISCX)$/%.c
195	@echo ------------------------------	195	@echo ------------------------------
196	@echo Making: $@	196	@echo Making: $@
197	.IF "$(GUI)"=="UNX"	197	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
198	@$(RM) $@ $(@:s/.obj/.o/)	198	@$(RM) $@ $(@:s/.obj/.o/)
199	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $(MISCX)$/$.c	199	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$.o $(MISCX)$/$.c
200	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@	200	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
201	.ELSE	201	.ELSE # "$(GUI)"=="UNX"
202	@+-$(RM) $@ >& nul	202	@+-$(RM) $@ >& nul
203	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $(MISCX)$/$.c )	203	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(MISCX)$/$.c )
204	@+$(ECHONL)	204	@+$(ECHONL)
205	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$.obj $(MISCX)$/$.c )	205	$(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$.obj $(MISCX)$/$.c )
206	.ENDIF	206	.ENDIF # "$(GUI)"=="UNX"
207		207
208	$(SLO)$/%.obj : $(MISCX)$/%.c	208	$(SLO)$/%.obj : $(MISCX)$/%.c
209	@echo ------------------------------	209	@echo ------------------------------
210	@echo Making: $@	210	@echo Making: $@
211	.IF "$(GUI)"=="UNX"	211	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
212	@$(RM) $@ $(@:s/.obj/.o/)	212	@$(RM) $@ $(@:s/.obj/.o/)
213	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$.o $(MISCX)$/$.c	213	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$.o $(MISCX)$/$.c
214	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@	214	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
215	.ELSE	215	.ELSE # "$(GUI)"=="UNX"
216	@+-$(RM) $@ >& nul	216	@+-$(RM) $@ >& nul
217	@+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c )	217	@+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(MISCX)$/$.c )
218	@+$(ECHONL)	218	@+$(ECHONL)
219	.IF "$(COM)"=="GCC"	219	.IF "$(COM)"=="GCC"
220	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c	220	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(MISCX)$/$.c
221	.ELSE	221	.ELSE
222	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$.obj $(MISCX)$/$.c )	222	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $(MISCX)$/$.c )
223	.ENDIF
224	.ENDIF	223	.ENDIF
		224	.ENDIF # "$(GUI)"=="UNX"
225		225
226	$(SLO)$/%.obj : %.c	226	$(SLO)$/%.obj : %.c
227	@echo ------------------------------	227	@echo ------------------------------
228	@echo Making: $@	228	@echo Making: $@
229	.IF "$(GUI)"=="UNX"	229	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
230	@$(RM) $@ $(@:s/.obj/.o/)	230	@$(RM) $@ $(@:s/.obj/.o/)
231	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$.o $.c	231	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$.o $.c
232	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@	232	+if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
233	.ELSE	233	.ELSE # "$(GUI)"=="UNX"
234	@+-$(RM) $@ >& nul	234	@+-$(RM) $@ >& nul
235	.IF "$(COM)"=="GCC"	235	.IF "$(COM)"=="GCC"
236	$(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c	236	$(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c
237	.ELSE	237	.ELSE
238	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c )	238	$(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$.obj $.c )
239	.ENDIF	239	.ENDIF
240	.ENDIF	240	.ENDIF # "$(GUI)"=="UNX"
241		241
242	# Objective-C files	242	# Objective-C files
243	$(OBJ)$/%.obj : %.m	243	$(OBJ)$/%.obj : %.m
Lines 450-456 Link Here
450	@echo ------------------------------ $(noout)	450	@echo ------------------------------ $(noout)
451	@echo Making: $@ $(noout)	451	@echo Making: $@ $(noout)
452	@+-$(RM) $@ >& $(NULLDEV)	452	@+-$(RM) $@ >& $(NULLDEV)
453	.IF "$(GUI)"=="UNX"	453	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
454	@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< \| sed s\#$(MISC)$/\#\# > $@	454	@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< \| sed s\#$(MISC)$/\#\# > $@
455	.ELSE # "$(GUI)"=="UNX"	455	.ELSE # "$(GUI)"=="UNX"
456	@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< \| $(SED) s/$(MISC:s/\/\\/)\\// > $@	456	@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< \| $(SED) s/$(MISC:s/\/\\/)\\// > $@
Lines 465-471 Link Here
465	@echo ------------------------------ $(noout)	465	@echo ------------------------------ $(noout)
466	@echo Making: $@ $(noout)	466	@echo Making: $@ $(noout)
467	@+-$(RM) $@ >& $(NULLDEV)	467	@+-$(RM) $@ >& $(NULLDEV)
468	.IF "$(GUI)"=="UNX"	468	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
469	@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< \| sed s\#$(MISC)$/\#\# > $@	469	@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< \| sed s\#$(MISC)$/\#\# > $@
470	.ELSE # "$(GUI)"=="UNX"	470	.ELSE # "$(GUI)"=="UNX"
471	@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< \| $(SED) s/$(MISC:s/\/\\/)\\// > $@	471	@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< \| $(SED) s/$(MISC:s/\/\\/)\\// > $@
Lines 568-580 Link Here
568	$(MISC)$/%.dpj :	568	$(MISC)$/%.dpj :
569	@+echo Making dpj...	569	@+echo Making dpj...
570	.IF "$(nodep)"!=""	570	.IF "$(nodep)"!=""
571	.IF "$(GUI)"=="UNX"	571	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
572	@+echo > $@	572	@+echo > $@
573	.ELSE	573	.ELSE
574	@+$(ECHONL) > $@	574	@+$(ECHONL) > $@
575	.ENDIF	575	.ENDIF
576	.ELSE # "$(ndep)"==""	576	.ELSE # "$(ndep)"==""
577	.IF "$(GUI)"=="UNX"	577	.IF "$(GUI)"=="UNX" \|\| "$(GUI)$(COM)"=="WNTGCC"
578	@+echo $(shell +$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/:/ /) -i $i) $(JAVACLASSFILES)))	578	@+echo $(shell +$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/:/ /) -i $i) $(JAVACLASSFILES)))
579	.ELSE	579	.ELSE
580	@+echo $(shell +$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/;/ /) -i $i) $(JAVACLASSFILES)))	580	@+echo $(shell +$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/;/ /) -i $i) $(JAVACLASSFILES)))