From e389e3aef4fddf06a0e1e902802ad00f2e60905f Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Fri, 31 Dec 2010 00:35:16 +0900
Subject: i#116264: gbuild for MinGW

---
 svl/Library_fsstorage.mk         | 15 +++++++++++++++
 svl/Library_passwordcontainer.mk | 15 +++++++++++++++
 svl/Library_svl.mk               | 17 +++++++++++++++++
 3 files changed, 47 insertions(+)

(limited to 'svl')

diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index f109e0620d5e..93ca50a2d9f4 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -67,6 +67,20 @@ $(eval $(call gb_Library_add_exception_objects,fsstorage,\
 ))
 
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,fsstorage,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    moldname \
+    mingwex \
+    kernel32 \
+    msvcrt \
+    user32 \
+))
+else
 $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     kernel32 \
     msvcrt \
@@ -75,4 +89,5 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     uwinapi \
 ))
 endif
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index d0b35552e18a..a0fbe88be93d 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -63,6 +63,20 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
 ))
 
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    moldname \
+    mingwex \
+    kernel32 \
+    msvcrt \
+    user32 \
+))
+else
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     kernel32 \
     msvcrt \
@@ -71,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     uwinapi \
 ))
 endif
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 7faf5caa7f65..5181983b8bc1 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -169,6 +169,22 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/svdde/ddewrap \
 ))
 
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,svl,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    mingwex \
+    advapi32 \
+    kernel32 \
+    gdi32 \
+    msvcrt \
+    shell32 \
+    user32 \
+))
+else
 $(eval $(call gb_Library_add_linked_libs,svl,\
     advapi32 \
     kernel32 \
@@ -178,6 +194,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
     user32 \
     uwinapi \
 ))
+endif
 else
 $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/unx/source/svdde/ddedummy \
-- 
cgit 


From 719a761b4f8e71a5cf86d5c92bff0cb44be612c7 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

---
 svl/Library_fsstorage.mk         | 15 ---------------
 svl/Library_passwordcontainer.mk | 15 ---------------
 svl/Library_svl.mk               | 17 -----------------
 3 files changed, 47 deletions(-)

(limited to 'svl')

diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 93ca50a2d9f4..f109e0620d5e 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -67,20 +67,6 @@ $(eval $(call gb_Library_add_exception_objects,fsstorage,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,fsstorage,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     kernel32 \
     msvcrt \
@@ -89,5 +75,4 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index a0fbe88be93d..d0b35552e18a 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -63,20 +63,6 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     kernel32 \
     msvcrt \
@@ -85,5 +71,4 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 5181983b8bc1..7faf5caa7f65 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -169,22 +169,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/svdde/ddewrap \
 ))
 
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,svl,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
-    advapi32 \
-    kernel32 \
-    gdi32 \
-    msvcrt \
-    shell32 \
-    user32 \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,svl,\
     advapi32 \
     kernel32 \
@@ -194,7 +178,6 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
     user32 \
     uwinapi \
 ))
-endif
 else
 $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/unx/source/svdde/ddedummy \
-- 
cgit 


From 93d8027d3dc7d52fb96325601ee35562560c68d5 Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Wed, 5 Jan 2011 22:55:15 +0900
Subject: mingwport33: i#116264: gbuild for MinGW

---
 svl/Library_fsstorage.mk         | 15 +++++++++++++++
 svl/Library_passwordcontainer.mk | 15 +++++++++++++++
 svl/Library_svl.mk               | 17 +++++++++++++++++
 3 files changed, 47 insertions(+)

(limited to 'svl')

diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index f109e0620d5e..93ca50a2d9f4 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -67,6 +67,20 @@ $(eval $(call gb_Library_add_exception_objects,fsstorage,\
 ))
 
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,fsstorage,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    moldname \
+    mingwex \
+    kernel32 \
+    msvcrt \
+    user32 \
+))
+else
 $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     kernel32 \
     msvcrt \
@@ -75,4 +89,5 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
     uwinapi \
 ))
 endif
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index d0b35552e18a..a0fbe88be93d 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -63,6 +63,20 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
 ))
 
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    moldname \
+    mingwex \
+    kernel32 \
+    msvcrt \
+    user32 \
+))
+else
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     kernel32 \
     msvcrt \
@@ -71,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
     uwinapi \
 ))
 endif
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 7faf5caa7f65..5181983b8bc1 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -169,6 +169,22 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/svdde/ddewrap \
 ))
 
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,svl,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    mingwex \
+    advapi32 \
+    kernel32 \
+    gdi32 \
+    msvcrt \
+    shell32 \
+    user32 \
+))
+else
 $(eval $(call gb_Library_add_linked_libs,svl,\
     advapi32 \
     kernel32 \
@@ -178,6 +194,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
     user32 \
     uwinapi \
 ))
+endif
 else
 $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/unx/source/svdde/ddedummy \
-- 
cgit