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 | f7d5dd5f78289e1e0934d45262debd532432394f (patch) | |
| tree | b582bd83ab8e0f908349ebde958d303ba47091a4 /comphelper | |
| parent | 017970dc24d6b9e7b647a296a638e4c6892ab42e (diff) | |
CWS gnumake3: use standard linked libs on Windows
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/Library_comphelp.mk | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 841b0522a38f..37551b8b35e7 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -46,12 +46,13 @@ $(eval $(call gb_Library_set_defs,comphelper,\ )) $(eval $(call gb_Library_add_linked_libs,comphelper,\ - sal \ - cppuhelper \ + sal \ + cppuhelper \ cppu \ - ucbhelper \ + ucbhelper \ vos3 \ stl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,comphelper,\ @@ -119,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/uieventslogger \ comphelper/source/misc/weak \ comphelper/source/misc/weakeventlistener \ - comphelper/source/officeinstdir/officeinstallationdirectories \ + comphelper/source/officeinstdir/officeinstallationdirectories \ comphelper/source/processfactory/componentfactory \ comphelper/source/processfactory/processfactory \ comphelper/source/property/ChainablePropertySet \ @@ -160,11 +161,4 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\ pthread \ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,comphelper,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif # vim: set noet sw=4 ts=4: |