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 /sfx2 | |
| parent | d1d8b2619b4ddd60fdb658240e48fa223d5b53ae (diff) | |
CWS gnumake3: use standard linked libs on Windows
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/CppunitTest_sfx2_metadatable.mk | 10 | ||||
| -rwxr-xr-x | sfx2/Library_sfx.mk | 8 |
2 files changed, 3 insertions, 15 deletions
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index b914422813ee..d2a31b624d0d 100755 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ sal \ sfx \ stl \ + $(gb_StdLibs) \ )) $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ @@ -43,13 +44,4 @@ $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ -I$(OUTDIR)/inc \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ - kernel32 \ - user32 \ - oldnames \ - msvcrt \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 6ead09f6eb48..9ce73f2369ef 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ vcl \ vos3 \ xml2 \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_linked_system_libs,sfx,\ @@ -290,7 +291,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ mingw32 \ $(gb_MINGW_LIBGCC) \ uwinapi \ - moldname \ mingwex \ advapi32 \ gdi32 \ @@ -303,16 +303,12 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ )) else $(eval $(call gb_Library_add_linked_libs,sfx,\ - advapi32 \ gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ + advapi32 \ ole32 \ shell32 \ user32 \ uuid \ - uwinapi \ )) endif else |