Attachment #5924 for issue #13888

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




	@$(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 ------------------------------

	@$(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 ------------------------------

	@$(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 ------------------------------

	@$(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

Return to issue 13888

Lines 179-195 Link Here

(-)solenv/inc/rules.mk (-18 / +18 lines)
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 ------------------------------
Lines 198-209 Link Here
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 ------------------------------
Lines 212-227 Link Here
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 ------------------------------
Lines 230-243 Link Here
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