From bb5bdbbdca966c03e6b22b455630381154cb6d01 Mon Sep 17 00:00:00 2001
From: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Fri, 16 Sep 2011 16:25:27 +0200
Subject: Revert "Trying to chop out the uwinapi library"

This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.
---
 shell/source/win32/makefile.mk                      | 1 +
 shell/source/win32/shlxthandler/makefile.mk         | 3 +++
 shell/source/win32/shlxthandler/ooofilt/makefile.mk | 4 ++++
 shell/source/win32/shlxthandler/prophdl/makefile.mk | 3 +++
 4 files changed, 11 insertions(+)

(limited to 'shell/source')

diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk
index ad07dca51b9a..3878a8f9f456 100644
--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
@@ -46,6 +46,7 @@ SHL1TARGET=$(TARGET).uno
 SHL1STDLIBS=$(CPPULIB)\
             $(CPPUHELPERLIB)\
             $(SALLIB)\
+            $(UWINAPILIB) \
             $(ADVAPI32LIB) \
             $(OLE32LIB) \
             $(SHELL32LIB)
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index f6d6c7d538d4..5778ccebd50d 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -46,6 +46,9 @@ ALL :
 .ENDIF
 
 
+UWINAPILIB =
+UWINAPILIB_X64 =
+
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
 .IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
index 993f61729280..92111c6ed0ee 100644
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -32,6 +32,10 @@ LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
+# Do not use the uwinapi library
+UWINAPILIB=
+
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk
index 3c5c0906e728..0dc48af1bfe5 100644
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -46,6 +46,9 @@ ALL :
 .ENDIF
 
 
+UWINAPILIB =
+UWINAPILIB_X64 =
+
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
 .IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100
-- 
cgit