diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-01 18:44:12 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-01 18:44:12 +0100 |
| commit | 2e98dd0232e6f593998060844c50851a54bd3cef (patch) | |
| tree | b9b4f9f03a952c9f43e6dee98037a26a28ea927c /framework | |
| parent | CWS gnumake3: workaround for cygwin coredump; don't create deliverlog in para... (diff) | |
| download | core-2e98dd0232e6f593998060844c50851a54bd3cef.tar.gz core-2e98dd0232e6f593998060844c50851a54bd3cef.zip | |
CWS gnumake3: use standard linked libs on Windows
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Library_fwe.mk | 7 | ||||
| -rw-r--r-- | framework/Library_fwi.mk | 8 | ||||
| -rw-r--r-- | framework/Library_fwk.mk | 7 | ||||
| -rw-r--r-- | framework/Library_fwl.mk | 7 | ||||
| -rw-r--r-- | framework/Library_fwm.mk | 7 |
5 files changed, 5 insertions, 31 deletions
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 4197128abf6e..63ff8cbb9897 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ utl \ vcl \ vos3 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwe,\ @@ -116,12 +117,6 @@ $(eval $(call gb_Library_add_linked_libs,fwe,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwe,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # TODO: visibility diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 1ba9d9fda79a..e510768700be 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ utl \ vcl \ vos3 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwi,\ @@ -91,21 +92,14 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\ mingw32 \ $(gb_MINGW_LIBGCC) \ uwinapi \ - moldname \ mingwex \ advapi32 \ kernel32 \ msvcrt \ - unicows \ )) else $(eval $(call gb_Library_add_linked_libs,fwi,\ advapi32 \ - kernel32 \ - msvcrt \ - stl \ - unicows \ - uwinapi \ )) endif endif diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 0bafaa85c23e..80a0ea120d1f 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ ucbhelper \ utl \ vcl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwk,\ @@ -201,12 +202,6 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwk,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index 4fb96617cad3..86325804e513 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ tl \ utl \ vcl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwl,\ @@ -101,12 +102,6 @@ $(eval $(call gb_Library_add_linked_libs,fwl,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwl,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 7e75f3f8906f..f441f4d78d56 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ utl \ vcl \ vos3 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,fwm,\ @@ -83,12 +84,6 @@ $(eval $(call gb_Library_add_linked_libs,fwm,\ kernel32 \ msvcrt \ )) -else -$(eval $(call gb_Library_add_linked_libs,fwm,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: |