diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:24:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 11:24:35 +0000 |
| commit | 7e5d03597c08b9e40afd35521852789d5323739f (patch) | |
| tree | e4fcf5392e7aacb156443009f7d18a9c04f1fcd1 /solenv/inc/set_wntx64.mk | |
| parent | 6eecdda3133fd79359464b77e6861d64d38e3f06 (diff) | |
INTEGRATION: CWS obo33 (1.3.178); FILE MERGED
2008/08/20 13:52:57 obo 1.3.178.1: #i92950# Changes for 64 bit Vista shell extension
Diffstat (limited to 'solenv/inc/set_wntx64.mk')
| -rw-r--r-- | solenv/inc/set_wntx64.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 4d91b901afee..808b5b2aee18 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_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: set_wntx64.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # This file is part of OpenOffice.org. # @@ -39,8 +39,12 @@ .IF "$(BUILD_X64)"!="" # ----------------- settings for x64 -------------------- -CC_X64*:=$(WRAPCMD) $(COMPROOT)$/PlatformSDK$/vc$/bin$/x86_x64$/cl.exe -CXX_X64*:=$(WRAPCMD) $(COMPROOT)$/PlatformSDK$/vc$/bin$/x86_x64$/cl.exe +CC_X64*:=$(WRAPCMD) $(CXX_X64_BINARY) +CXX_X64*:=$(WRAPCMD) $(CXX_X64_BINARY) +LINK_X64*:=$(WRAPCMD) $(LINK_X64_BINARY) $(NOLOGO) -MACHINE:X64 +LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO) +IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) + USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR USE_CFLAGS_X64+=$(CFLAGS_X64) USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS @@ -69,7 +73,6 @@ CDEFSSLOMT_X64+=-D_MT CDEFSOBJMT_X64+=-D_MT .ENDIF # "$(DYNAMIC_CRT)"!="" -LINK_X64=$(WRAPCMD) $(COMPROOT)$/PlatformSDK$/vc$/bin$/x86_x64$/link.exe $(NOLOGO) -MACHINE:X64 .IF "$(PRODUCT)"!="full" .ELSE LINKFLAGS_X64=/MAP /OPT:NOREF @@ -92,8 +95,6 @@ STDSLOGUI_X64= STDOBJCUI_X64= STDSLOCUI_X64= -LIBMGR_X64=$(WRAPCMD) $(COMPROOT)$/PlatformSDK$/vc$/bin$/x86_x64$/lib.exe $(NOLOGO) -IMPLIB_X64=$(WRAPCMD) $(COMPROOT)$/PlatformSDK$/vc$/bin$/x86_x64$/lib.exe IMPLIBFLAGS_X64=-machine:X64 LIBPATH_X64=$(PSDK)$/lib$/x64 @@ -182,3 +183,7 @@ DEF1TARGETN_X64=$(MISC_X64)$/$(DEF1NAME_X64).def DEF2TARGETN_X64=$(MISC_X64)$/$(DEF2NAME_X64).def .ENDIF .ENDIF # "$(BUILD_X64)"!="" + + + + |