From 250717f4a881b4592582f240dbcc10db5f3bffd8 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 27 Aug 2008 13:48:38 +0000 Subject: INTEGRATION: CWS native186_DEV300 (1.13.34); FILE MERGED 2008/08/20 09:49:22 sb 1.13.34.1: #i92939# removed unnecessary UWINAPILIB dependency --- shell/source/win32/shlxthandler/makefile.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 73f6c96117..07eea87f02 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # # This file is part of OpenOffice.org. # @@ -42,6 +42,9 @@ USE_DEFFILE_X64=TRUE .INCLUDE : settings.mk +UWINAPILIB = +UWINAPILIB_X64 = + 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 @@ -68,7 +71,7 @@ SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ $(SOLARLIBDIR)$/expat_xmlparse.lib\ $(SOLARLIBDIR)$/expat_xmltok.lib .ENDIF -SHL1STDLIBS+=$(UWINAPILIB)\ +SHL1STDLIBS+=\ $(OLEAUT32LIB)\ $(ADVAPI32LIB)\ $(OLE32LIB)\ @@ -112,7 +115,7 @@ SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ $(SOLARLIBDIR_X64)$/expat_xmltok.lib -SHL1STDLIBS_X64+=$(UWINAPILIB_X64)\ +SHL1STDLIBS_X64+=\ $(OLEAUT32LIB_X64)\ $(ADVAPI32LIB_X64)\ $(OLE32LIB_X64)\ -- cgit v1.2.3