diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-02 08:43:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-02 08:43:36 +0000 |
| commit | a0234a1cc11fd9954574cd632bad4e2ab542f8d9 (patch) | |
| tree | 3df9df7f8ae0f815546efa75646e0c5c2cc470c0 /shell | |
| parent | 0fdcfc5f31478e63b766a7ccbdfafb7bff4e9a09 (diff) | |
INTEGRATION: CWS obo24 (1.11.74); FILE MERGED
2008/03/13 15:26:35 obo 1.11.74.1: #i75046# additional build for 64 bit shell extension (Windows Vista)
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/makefile.mk | 61 |
1 files changed, 54 insertions, 7 deletions
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 0b91dea30d1d..06c101dc6816 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2007-05-25 11:13:40 $ +# last change: $Author: kz $ $Date: 2008-04-02 09:43:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,12 +39,14 @@ TARGET=shlxthdl LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE - +.IF "$(BUILD_X64)"!="" +USE_DEFFILE_X64=TRUE +.ENDIF # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-D_WIN32_IE=0x501 @@ -85,7 +87,7 @@ SHL1LIBS+=$(SLB)$/util.lib\ SHL1DEPN= -SHL1OBJS=$(SLOFILES) +SHL1OBJS=$(SLOFILES) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1RES=$(RES)$/$(TARGET).res @@ -93,8 +95,53 @@ SHL1RES=$(RES)$/$(TARGET).res DEF1NAME=$(SHL1TARGET) DEF1EXPORTFILE=exports.dxp +.IF "$(BUILD_X64)"!="" +# -------------------- x64 ----------------------- +CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 +CDEFS_X64+=-D_WIN32_IE=0x501 + +SLOFILES_X64= \ + $(SLO_X64)$/classfactory.obj\ + $(SLO_X64)$/columninfo.obj\ + $(SLO_X64)$/infotips.obj\ + $(SLO_X64)$/propsheets.obj\ + $(SLO_X64)$/shlxthdl.obj\ + $(SLO_X64)$/listviewbuilder.obj\ + $(SLO_X64)$/document_statistic.obj\ + $(SLO_X64)$/thumbviewer.obj + +SHL1TARGET_X64=$(TARGET) +SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ + $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ + $(SOLARLIBDIR_X64)$/expat_xmltok.lib + +SHL1STDLIBS_X64+=$(UWINAPILIB_X64)\ + $(OLEAUT32LIB_X64)\ + $(ADVAPI32LIB_X64)\ + $(OLE32LIB_X64)\ + $(UUIDLIB_X64)\ + $(SHELL32LIB_X64)\ + $(KERNEL32LIB_X64)\ + $(GDI32LIB_X64)\ + $(MSVCRT_X64) \ + $(MSVCPRT_X64) \ + $(USER32LIB_X64) \ + $(OLDNAMESLIB_X64) \ + $(GDIPLUSLIB_X64) + +SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ + $(SLB_X64)$/ooofilereader.lib +SHL1OBJS_X64=$(SLOFILES_X64) +SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def +SHL1RES_X64=$(RES_X64)$/$(TARGET)_x64.res + +DEF1NAME_X64=$(SHL1TARGET_X64) +DEF1EXPORTFILE_X64=exports.dxp +.ENDIF # "$(BUILD_X64)"!="" + # --- Targets ------------------------------------------------------ +.INCLUDE : set_wntx64.mk .INCLUDE : target.mk - - +.INCLUDE : tg_wntx64.mk |