diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 06:24:12 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 06:24:12 +0000 |
commit | 8b22e9aa8c6b9bae02fb232f66dd4e6fb4ceac74 (patch) | |
tree | b7adaa1c1dd3b239b040c65c8838d2281acd3cb0 /solenv/inc/pstrules.mk | |
parent | 535e788c3cdfefbe001ac4136c4d6c6f8ca57554 (diff) |
INTEGRATION: CWS mingwport05 (1.47.56); FILE MERGED
2007/06/25 14:56:06 vg 1.47.56.1: #i78267# MinGW port efforts
Diffstat (limited to 'solenv/inc/pstrules.mk')
-rw-r--r-- | solenv/inc/pstrules.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index d847b8c82e36..b88767c1c637 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -4,9 +4,9 @@ # # $RCSfile: pstrules.mk,v $ # -# $Revision: 1.47 $ +# $Revision: 1.48 $ # -# last change: $Author: kz $ $Date: 2007-05-10 15:10:36 $ +# last change: $Author: obo $ $Date: 2007-07-17 07:24:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -96,8 +96,12 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @-$(RM) $@ +.IF "$(COM)"=="GCC" + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx +.ELSE $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) .ENDIF +.ENDIF $(SLO)$/$(SECOND_BUILD)_%.obj : %.c @echo ------------------------------ |