summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-02-03 10:24:18 +0100
committerMathias Bauer <mba@openoffice.org>2011-02-03 10:24:18 +0100
commit1851104998e0996874dbebccbfbd4778848f1f17 (patch)
tree5d92a8e6727674e590ee147a2908bd74ec4e4bca /framework
parentab451ff91e394a5f756558a9b27b39b55c43f075 (diff)
CWS gnumake3: clean up mingw stuff after adding STDLIBS
Diffstat (limited to 'framework')
-rw-r--r--framework/Library_fwe.mk14
-rw-r--r--framework/Library_fwi.mk14
-rw-r--r--framework/Library_fwk.mk15
-rw-r--r--framework/Library_fwl.mk14
-rw-r--r--framework/Library_fwm.mk15
5 files changed, 0 insertions, 72 deletions
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 0b44b82632d1..7e71e3068e70 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -97,19 +97,5 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_set_cxxflags,fwe,$$(filter-out -fvisibility=hidden,$$(CXXFLAGS))))
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 \
-))
-endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index fc60fdf15564..046c7230e35f 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -78,23 +78,9 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
))
ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,fwi,\
- mingwthrd \
- $(gb_MINGW_LIBSTDCPP) \
- mingw32 \
- $(gb_MINGW_LIBGCC) \
- uwinapi \
- mingwex \
advapi32 \
- kernel32 \
- msvcrt \
))
-else
-$(eval $(call gb_Library_add_linked_libs,fwi,\
- advapi32 \
-))
-endif
endif
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 27e3d924774c..a34a1bc59720 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -185,19 +185,4 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/xml/acceleratorconfigurationwriter \
))
-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 \
-))
-endif
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index cbf4a7b9a901..928c723d3f80 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -84,18 +84,4 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
framework/source/uielement/toolbarsmenucontroller \
))
-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 \
-))
-endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index c242ecc8e12f..dbd486c40de1 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -65,19 +65,4 @@ $(eval $(call gb_Library_add_exception_objects,fwm,\
framework/source/tabwin/tabwinfactory \
))
-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 \
-))
-endif
-endif
-
# vim: set noet sw=4 ts=4: