Backed out changeset: e84942bd0aca

6 files changed, 0 insertions, 95 deletions

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,\
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 6b2c0466f0ec..3d04c3b5a25a 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -49,20 +49,6 @@ $(eval $(call gb_Executable_add_exception_objects,bmpsum,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
     kernel32 \
     msvcrt \
@@ -71,7 +57,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
     uwinapi \
 ))
 endif
-endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index d6b96970eacc..99bde19e1055 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -50,20 +50,6 @@ $(eval $(call gb_Executable_add_exception_objects,g2g,\
     svtools/bmpmaker/g2g \
 ))
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Executable_add_linked_libs,g2g,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
 $(eval $(call gb_Executable_add_linked_libs,g2g,\
     kernel32 \
     msvcrt \
@@ -72,7 +58,6 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\
     uwinapi \
 ))
 endif
-endif
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,g2g,\
    pthread \
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 3e96d22588c8..150b71396284 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -64,20 +64,6 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
 ))
 endif
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
     kernel32 \
     msvcrt \
@@ -87,5 +73,4 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 5df44f631097..8b0c27d4469a 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -66,20 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\
 endif
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,productregistration,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    kernel32 \
-    msvcrt \
-    user32 \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,productregistration,\
     kernel32 \
     msvcrt \
@@ -88,5 +74,4 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f30ad02c3cd7..545690bd0f12 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -300,25 +300,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
 endif
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,svt,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    moldname \
-    mingwex \
-    advapi32 \
-    gdi32 \
-    kernel32 \
-    msvcrt \
-    ole32 \
-    oleaut32 \
-    user32 \
-    uuid \
-))
-else
 $(eval $(call gb_Library_add_linked_libs,svt,\
     advapi32 \
     gdi32 \
@@ -332,5 +313,4 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
     uwinapi \
 ))
 endif
-endif
 # vim: set noet sw=4 ts=4: