summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortono <tono@openoffice.org>2011-01-05 21:38:47 +0900
committertono <tono@openoffice.org>2011-01-05 21:38:47 +0900
commitcc9a9d52686d3874ed0932eba4a750845860ae3e (patch)
tree00defdb84ec1fc7ba9273c80748fcdbdc6b85313
parent24735ecb14ca4ea87ba531ac05bb6557a050e424 (diff)
Backed out changeset: e84942bd0aca
-rw-r--r--sw/Library_msword.mk16
-rw-r--r--sw/Library_sw.mk16
-rw-r--r--sw/Library_swd.mk13
-rw-r--r--sw/Library_swui.mk16
-rw-r--r--sw/Library_vbaswobj.mk16
5 files changed, 0 insertions, 77 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 34a52e4786c7..ee33da85561f 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -114,21 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,msword,\
))
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 \
-))
-else
$(eval $(call gb_Library_add_linked_libs,msword,\
advapi32 \
kernel32 \
@@ -138,5 +123,4 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
uwinapi \
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index e8e127d3ab0f..cc1df51d2dba 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -737,21 +737,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
endif
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 \
-))
-else
$(eval $(call gb_Library_add_linked_libs,sw,\
advapi32 \
kernel32 \
@@ -761,7 +746,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
uwinapi \
))
endif
-endif
$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 39440092c574..17511d3bf4ed 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -70,23 +70,10 @@ $(eval $(call gb_Library_add_exception_objects,swd,\
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 \
-))
-else
$(eval $(call gb_Library_add_linked_libs,swd,\
kernel32 \
msvcrt \
uwinapi \
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 927aaab1fd98..12227c9a0ae8 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -167,21 +167,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
))
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 \
-))
-else
$(eval $(call gb_Library_add_linked_libs,swui,\
advapi32 \
kernel32 \
@@ -191,5 +176,4 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
uwinapi \
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 645d383dd8f9..44bbfa8a0c6f 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -126,21 +126,6 @@ $(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 \
-))
-else
$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
advapi32 \
kernel32 \
@@ -150,5 +135,4 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
uwinapi \
))
endif
-endif
# vim: set noet sw=4 ts=4: