diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-03-02 14:38:51 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 01:02:37 +0200 |
| commit | ff4441cc5e473f7f1f8dd9a7fc46deaab445f7ae (patch) | |
| tree | 159986dafd43a378e7bbd2b775bac997d4ed8d2e /sax | |
| parent | fa4ec3c338e5b33e9886ee489bbe38ddd7dfae3c (diff) | |
CWS gnumake4: some fixes for Windows [hg:9eb9b5d5181e]
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/CppunitTest_sax.mk | 1 | ||||
| -rw-r--r-- | sax/Library_expwrap.mk | 21 | ||||
| -rw-r--r-- | sax/Library_fastsax.mk | 22 | ||||
| -rw-r--r-- | sax/Library_sax.mk | 1 | ||||
| -rw-r--r-- | sax/source/fastparser/facreg.cxx | 4 |
5 files changed, 33 insertions, 16 deletions
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk index d29632de5fae..b870f4045a18 100644 --- a/sax/CppunitTest_sax.mk +++ b/sax/CppunitTest_sax.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sax_cppunit, \ cppunit \ sax \ sal \ + stl \ $(gb_STDLIBS) \ )) diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index 58afe9ded9f4..9c73522b8212 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -46,25 +46,32 @@ $(eval $(call gb_Library_set_defs,expwrap,\ )) endif +$(eval $(call gb_Library_add_linked_libs,expwrap,\ + sal \ + cppu \ + cppuhelper \ + stl \ + $(gb_STDLIBS) \ +)) + ifeq ($(SYSTEM_EXPAT),YES) $(eval $(call gb_Library_set_defs,expwrap,\ $$(DEFS) \ -DSYSTEM_EXPAT \ )) +$(eval $(call gb_Library_add_linked_libs,expwrap,\ + expat \ +)) else $(eval $(call gb_Library_set_defs,expwrap,\ $$(DEFS) \ -DXML_UNICODE \ )) -endif - $(eval $(call gb_Library_add_linked_libs,expwrap,\ - sal \ - cppu \ - cppuhelper \ - expat \ - $(gb_STDLIBS) \ + expat_xmlparse \ + expat_xmltok \ )) +endif $(eval $(call gb_Library_add_exception_objects,expwrap,\ sax/source/expatwrap/attrlistimpl \ diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk index 06ef80b4ada0..8fe23330d963 100644 --- a/sax/Library_fastsax.mk +++ b/sax/Library_fastsax.mk @@ -39,6 +39,15 @@ $(eval $(call gb_Library_set_defs,fastsax,\ $$(DEFS) \ )) +$(eval $(call gb_Library_add_linked_libs,fastsax,\ + sal \ + cppu \ + cppuhelper \ + sax \ + stl \ + $(gb_STDLIBS) \ +)) + ifeq ($(SYSTEM_ZLIB),YES) $(eval $(call gb_Library_set_defs,fastsax,\ $$(DEFS) \ @@ -51,16 +60,15 @@ $(eval $(call gb_Library_set_defs,fastsax,\ $$(DEFS) \ -DSYSTEM_EXPAT \ )) -endif - $(eval $(call gb_Library_add_linked_libs,fastsax,\ - sal \ - cppu \ - cppuhelper \ expat \ - sax \ - $(gb_STDLIBS) \ )) +else +$(eval $(call gb_Library_add_linked_libs,fastsax,\ + expat_xmlparse \ + expat_xmltok \ +)) +endif # re-uses xml2utf object from sax.uno lib (see below) $(eval $(call gb_Library_add_exception_objects,fastsax,\ diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 0d3999c61e23..70492fb7a3cb 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,sax,\ cppu \ cppuhelper \ comphelper \ + stl \ $(gb_STDLIBS) \ )) diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx index 98a55823271e..af9d978df5e7 100644 --- a/sax/source/fastparser/facreg.cxx +++ b/sax/source/fastparser/facreg.cxx @@ -34,13 +34,13 @@ Reference< XInterface > SAL_CALL FastSaxSerializer_CreateInstance( const Referen extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; |