summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/Library_fwe.mk13
-rw-r--r--framework/Library_fwi.mk16
-rw-r--r--framework/Library_fwk.mk13
-rw-r--r--framework/Library_fwl.mk13
-rw-r--r--framework/Library_fwm.mk13
-rwxr-xr-xsfx2/Library_sfx.mk20
-rw-r--r--xmloff/Library_xo.mk15
-rw-r--r--xmloff/Library_xof.mk15
8 files changed, 0 insertions, 118 deletions
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:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 3c3ebe85294e..ed941d5b9a9f 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -285,25 +285,6 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\
, $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \
))
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,sfx,\
- mingwthrd \
- $(gb_MINGW_LIBSTDCPP) \
- mingw32 \
- $(gb_MINGW_LIBGCC) \
- uwinapi \
- moldname \
- mingwex \
- advapi32 \
- gdi32 \
- kernel32 \
- msvcrt \
- ole32 \
- shell32 \
- user32 \
- uuid \
-))
-else
$(eval $(call gb_Library_add_linked_libs,sfx,\
advapi32 \
gdi32 \
@@ -316,7 +297,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
uuid \
uwinapi \
))
-endif
else
$(eval $(call gb_Library_add_cxxobjects,sfx,\
sfx2/source/appl/shutdowniconw32 \
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index ddd7a21c8fb4..2e335b4175c4 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -390,20 +390,6 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
endif
ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,xo,\
- mingwthrd \
- $(gb_MINGW_LIBSTDCPP) \
- mingw32 \
- $(gb_MINGW_LIBGCC) \
- uwinapi \
- moldname \
- mingwex \
- kernel32 \
- msvcrt \
- user32 \
-))
-else
$(eval $(call gb_Library_add_linked_libs,xo,\
kernel32 \
msvcrt \
@@ -412,5 +398,4 @@ $(eval $(call gb_Library_add_linked_libs,xo,\
uwinapi \
))
endif
-endif
# vim: set noet ts=4 sw=4:
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index e809935d12ba..6880eb1a1fd9 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -101,20 +101,6 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
endif
ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_linked_libs,xof,\
- mingwthrd \
- $(gb_MINGW_LIBSTDCPP) \
- mingw32 \
- $(gb_MINGW_LIBGCC) \
- uwinapi \
- moldname \
- mingwex \
- kernel32 \
- msvcrt \
- user32 \
-))
-else
$(eval $(call gb_Library_add_linked_libs,xof,\
kernel32 \
msvcrt \
@@ -123,5 +109,4 @@ $(eval $(call gb_Library_add_linked_libs,xof,\
uwinapi \
))
endif
-endif
# vim: set noet ts=4 sw=4: