diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-01-19 12:20:03 +0100 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-01-19 12:20:03 +0100 |
commit | c626ddf06796749f1777d368425deec5743ebca0 (patch) | |
tree | 2e24b9c69fc77cf33ce2a1e35d9754ee62f7a7b8 | |
parent | 92bcdd86ab68aa1d37061e8e72e1280fbb9a92f2 (diff) | |
parent | 4344bf73859ac0583785059dccfe28da081ab821 (diff) |
CWS-TOOLING: integrate CWS mingwport33
-rw-r--r-- | sw/Library_msword.mk | 16 | ||||
-rw-r--r-- | sw/Library_sw.mk | 16 | ||||
-rw-r--r-- | sw/Library_swd.mk | 13 | ||||
-rw-r--r-- | sw/Library_swui.mk | 16 | ||||
-rw-r--r-- | sw/Library_vbaswobj.mk | 16 |
5 files changed, 77 insertions, 0 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ee33da85561f..34a52e4786c7 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -114,6 +114,21 @@ $(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 \ @@ -123,4 +138,5 @@ $(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 cc1df51d2dba..e8e127d3ab0f 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -737,6 +737,21 @@ $(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 \ @@ -746,6 +761,7 @@ $(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 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: diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 12227c9a0ae8..927aaab1fd98 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -167,6 +167,21 @@ $(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 \ @@ -176,4 +191,5 @@ $(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 44bbfa8a0c6f..645d383dd8f9 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -126,6 +126,21 @@ $(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 \ @@ -135,4 +150,5 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: |