From 24735ecb14ca4ea87ba531ac05bb6557a050e424 Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 31 Dec 2010 00:35:16 +0900 Subject: i#116264: gbuild for MinGW --- sw/Library_swd.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'sw/Library_swd.mk') diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 17511d3bf4ed..39440092c574 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -70,10 +70,23 @@ $(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: -- cgit From cc9a9d52686d3874ed0932eba4a750845860ae3e Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 21:38:47 +0900 Subject: Backed out changeset: e84942bd0aca --- sw/Library_swd.mk | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'sw/Library_swd.mk') 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: -- cgit From 4344bf73859ac0583785059dccfe28da081ab821 Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 22:55:15 +0900 Subject: mingwport33: i#116264: gbuild for MinGW --- sw/Library_swd.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'sw/Library_swd.mk') diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 17511d3bf4ed..39440092c574 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -70,10 +70,23 @@ $(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: -- cgit