diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-02 08:44:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-02 08:44:29 +0000 |
| commit | 49a28775f3e60924fb1daf68e5279f4cda013fd9 (patch) | |
| tree | 7d492c8bffb03328dabd2cd72e607a632ada5c0e /shell | |
| parent | c47d4af5dec94901cc4c6e1a6df05afd7ed41685 (diff) | |
INTEGRATION: CWS obo24 (1.5.64); FILE MERGED
2008/03/13 15:26:36 obo 1.5.64.1: #i75046# additional build for 64 bit shell extension (Windows Vista)
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk index 7e7eb6e47cda..fdae88f58534 100644 --- a/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk +++ b/shell/source/win32/shlxthandler/ooofilt/proxy/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2007-06-27 14:04:39 $ +# last change: $Author: kz $ $Date: 2008-04-02 09:44:29 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,7 +66,31 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp +.IF "$(BUILD_X64)"!="" +#------------- x64 stuff ---------------- +USE_DEFFILE_X64=TRUE +CFLAGS_X64+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CDEFS_X64+=-D_WIN32_IE=0x501 + +SLOFILES_X64=$(SLO_X64)$/ooofiltproxy.obj +SHL1TARGET_X64=$(TARGET) +SHL1STDLIBS_X64=$(OLE32LIB_X64)\ + $(ADVAPO32LIB_X64)\ + $(COMCTL32LIB_X64)\ + $(UUIDLIB_X64)\ + $(SHELL32LIB_X64)\ + $(KERNEL32LIB_X64)\ + $(MSVCRT_X64) + +SHL1DEPN_X64= +SHL1OBJS_X64=$(SLO_X64)$/ooofiltproxy.obj +SHL1DEF_X64=$(MISC_X64)$/$(TARGET).def +DEF1NAME_X64=$(TARGET) +DEF1EXPORTFILE_X64=exports.dxp +.ENDIF # "$(BUILD_X64)"!="" + # --- Targets ------------------------------------------------------ +.INCLUDE : set_wntx64.mk .INCLUDE : target.mk - +.INCLUDE : tg_wntx64.mk |