From f00fbe6e91ce371f589d5f0fe4dd485dbb31064a Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Wed, 5 Jan 2011 21:38:47 +0900
Subject: Backed out changeset: e84942bd0aca

---
 framework/Library_fwe.mk | 13 -------------
 framework/Library_fwi.mk | 16 ----------------
 framework/Library_fwk.mk | 13 -------------
 framework/Library_fwl.mk | 13 -------------
 framework/Library_fwm.mk | 13 -------------
 5 files changed, 68 deletions(-)

(limited to 'framework')

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 013fe5bbf56c..33d8959a474e 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -105,24 +105,11 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\
 ))
 endif
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwe,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,fwe,\
     kernel32 \
     msvcrt \
     uwinapi \
 ))
 endif
-endif
 # TODO: visibility
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 8512b3a874fe..568f0a1eb22a 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -84,21 +84,6 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
 ))
 endif
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwi,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    advapi32 \
-    kernel32 \
-    msvcrt \
-    unicows \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,fwi,\
     advapi32 \
     kernel32 \
@@ -108,6 +93,5 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     uwinapi \
 ))
 endif
-endif
 # TODO: visibility
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 1df0c931e564..50c16b83b42a 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -190,23 +190,10 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
 ))
 endif
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwk,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,fwk,\
     kernel32 \
     msvcrt \
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index b8b5290f1749..d2002115eaf0 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -90,23 +90,10 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\
 ))
 endif
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwl,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,fwl,\
     kernel32 \
     msvcrt \
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index e67c2a627091..9ff49719148a 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -72,23 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\
 ))
 endif
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fwm,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    kernel32 \
-    msvcrt \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,fwm,\
     kernel32 \
     msvcrt \
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4:
-- 
cgit