diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-03 10:24:18 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-03 10:24:18 +0100 |
| commit | f6995c48aabedfda6ba6852eabeb10d335cad219 (patch) | |
| tree | 18ace76a2e7be00ef1900ef68e24289050f7ec04 | |
| parent | c3c1e664ee43c83937f82362e64296ec9d8018e6 (diff) | |
CWS gnumake3: clean up mingw stuff after adding STDLIBS
| -rw-r--r-- | sw/Library_msword.mk | 17 | ||||
| -rw-r--r-- | sw/Library_sw.mk | 18 | ||||
| -rw-r--r-- | sw/Library_swd.mk | 15 | ||||
| -rw-r--r-- | sw/Library_swui.mk | 17 | ||||
| -rw-r--r-- | sw/Library_vbaswobj.mk | 17 |
5 files changed, 1 insertions, 83 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 67f96f5fd20c..530fa53908b7 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -113,21 +113,4 @@ $(eval $(call gb_Library_add_exception_objects,msword,\ sw/source/filter/ww8/ww8scan \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,msword,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - msvcrt \ - user32 \ -)) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 2781ef76814a..d097896087ba 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -727,24 +727,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/ui/wrtsh/wrtundo \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,sw,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - msvcrt \ - user32 \ -)) -endif -endif - $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter)) $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 4f6de7a8dbc0..a0dcfaf29c3a 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -68,18 +68,5 @@ $(eval $(call gb_Library_add_exception_objects,swd,\ sw/source/ui/uno/swdet2 \ sw/source/ui/uno/swdetect \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,swd,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif + # vim: set noet sw=4 ts=4: diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index ac3a8dfe3bca..f7b3f529c80f 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -165,21 +165,4 @@ $(eval $(call gb_Library_add_exception_objects,swui,\ sw/source/ui/utlui/swrenamexnameddlg \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,swui,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - msvcrt \ - user32 \ -)) -endif -endif # vim: set noet sw=4 ts=4: diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index ff417692f245..140dd38d623d 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -121,21 +121,4 @@ $(eval $(call gb_Library_set_ldflags,vbaswobj,\ )) endif -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - msvcrt \ - user32 \ -)) -endif -endif # vim: set noet sw=4 ts=4: |