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

---
 svtools/Executable_bmp.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'svtools/Executable_bmp.mk')

diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 24019ced63d2..67b21600e523 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -53,6 +53,20 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\
 ))
 
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Executable_add_linked_libs,bmp,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    moldname \
+    mingwex \
+    kernel32 \
+    msvcrt \
+    user32 \
+))
+else
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
     kernel32 \
     msvcrt \
@@ -61,6 +75,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
     uwinapi \
 ))
 endif
+endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
-- 
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

---
 svtools/Executable_bmp.mk | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'svtools/Executable_bmp.mk')

diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 67b21600e523..24019ced63d2 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -53,20 +53,6 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,bmp,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
     kernel32 \
     msvcrt \
@@ -75,7 +61,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
     uwinapi \
 ))
 endif
-endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
-- 
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

---
 svtools/Executable_bmp.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'svtools/Executable_bmp.mk')

diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 24019ced63d2..67b21600e523 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -53,6 +53,20 @@ $(eval $(call gb_Executable_add_exception_objects,bmp,\
 ))
 
 ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Executable_add_linked_libs,bmp,\
+    mingwthrd \
+    $(gb_MINGW_LIBSTDCPP) \
+    mingw32 \
+    $(gb_MINGW_LIBGCC) \
+    uwinapi \
+    moldname \
+    mingwex \
+    kernel32 \
+    msvcrt \
+    user32 \
+))
+else
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
     kernel32 \
     msvcrt \
@@ -61,6 +75,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
     uwinapi \
 ))
 endif
+endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
-- 
cgit