diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:24:48 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:24:48 +0000 |
| commit | f5da46a2f8929e549970a803fe99ee35c1955223 (patch) | |
| tree | 8167e70ccc11ea81e68e91a401e21c2117728d8e /solenv/inc | |
| parent | 7e5d03597c08b9e40afd35521852789d5323739f (diff) | |
INTEGRATION: CWS obo33 (1.3.178); FILE MERGED
2008/08/20 14:39:22 obo 1.3.178.3: #i92950# Changes for 64 bit Vista shell extension
2008/08/20 13:52:03 obo 1.3.178.2: #i92950# EOL missing
2008/08/20 13:50:37 obo 1.3.178.1: #i92950# Changes for 64 bit Vista shell extension
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/tg_wntx64.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk index ffe46697044c..c65ef3d09b3b 100644 --- a/solenv/inc/tg_wntx64.mk +++ b/solenv/inc/tg_wntx64.mk @@ -1,14 +1,14 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite # # $RCSfile: tg_wntx64.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # This file is part of OpenOffice.org. # @@ -503,8 +503,7 @@ $(SLO_X64)$/%.obj : %.cxx @echo Making: $@ @@-$(RM) $@ >& $(NULLDEV) -$(MKDIR) $(@:d) - @$(TYPE) $(mktmp $(CXX_X64) $(ACT_PCH_SWITCHES) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) $(CAPTURE_OUTPUT) - $(CXX_X64) @$(mktmp $(ACT_PCH_SWITCHES) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) + $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) $(SLO_X64)$/%.obj : $(MISC)$/%.c @echo ------------------------------ @@ -523,3 +522,7 @@ $(SLO_X64)$/%.obj : %.c $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $*.c ) .ENDIF # "$(BUILD_X64)"!="" + + + + |