strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from DEv300:m71

Browse source
This commit is contained in:
Ocke Janssen [oj] 2010-02-04 09:18:33 +01:00
commit 6cd38cd13e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
solenv/inc/rules.mk
View file

@ -224,7 +224,7 @@ $(SLO)/%.obj : %.cpp
.ENDIF # "$(nodep)"==""
$(SLO)/%.obj : $(MISC)/%.cxx
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx
@ -249,7 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx
.ENDIF # "$(nodep)"==""
$(SLO)/%.obj : $(MISC)/%.cc
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc
@ -415,7 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m
# Objective-C files
$(SLO)/%.obj : $(MISC)/%.m
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
.IF "$(OS)"=="MACOSX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
@ -476,7 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm
# Objective-C++ files
$(SLO)/%.obj : $(MISC)/%.mm
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE)
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
.IF "$(OS)"=="MACOSX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm