diff options
| -rw-r--r-- | registry/source/reflread.cxx | 8 | ||||
| -rw-r--r-- | registry/source/reflwrit.cxx | 8 | ||||
| -rw-r--r-- | registry/source/registry.cxx | 8 | ||||
| -rw-r--r-- | store/prj/d.lst | 5 |
4 files changed, 18 insertions, 11 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 1f64ec58d..19d387961 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -2,9 +2,9 @@ * * $RCSfile: reflread.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2001-05-30 15:08:16 $ + * last change: $Author: mh $ $Date: 2002-04-23 14:30:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,6 +89,10 @@ const sal_uInt16 majorVersion = 0x0001; ORealDynamicLoader* ODynamicLoader<RegistryTypeReader_Api>::m_pLoader = NULL; #endif +#if defined(MACOSX) +ORealDynamicLoader* ODynamicLoader<RegistryTypeReader_Api>::m_pStaticLoader = NULL; +#endif + /************************************************************************** class BlopObject diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index a88781611..c295181dc 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: reflwrit.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jsc $ $Date: 2001-03-14 09:36:00 $ + * last change: $Author: mh $ $Date: 2002-04-23 14:30:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,10 @@ static sal_Unicode NULL_WSTRING[1] = { 0 }; ORealDynamicLoader* ODynamicLoader<RegistryTypeWriter_Api>::m_pLoader = NULL; #endif +#if defined(MACOSX) +ORealDynamicLoader* ODynamicLoader<RegistryTypeWriter_Api>::m_pStaticLoader = NULL; +#endif + #define BLOP_OFFSET_MAGIC 0 #define BLOP_OFFSET_SIZE (BLOP_OFFSET_MAGIC + sizeof(sal_uInt32)) #define BLOP_OFFSET_MINOR (BLOP_OFFSET_SIZE + sizeof(sal_uInt32)) diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 599db0232..49eaac2e9 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registry.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2002-02-21 10:51:12 $ + * last change: $Author: mh $ $Date: 2002-04-23 14:30:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,6 +92,10 @@ using namespace salhelper; ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL; #endif +#if defined(MACOSX) +ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pStaticLoader = NULL; +#endif + OString getTempName() { static OUString TMP(RTL_CONSTASCII_USTRINGPARAM("TMP")); diff --git a/store/prj/d.lst b/store/prj/d.lst index 2587f741c..c73abf12a 100644 --- a/store/prj/d.lst +++ b/store/prj/d.lst @@ -8,11 +8,6 @@ mkdir: %_DEST%\inc%_EXT%\store ..\%__SRC%\lib\libsto*.* %_DEST%\lib%_EXT%\libsto*.* ..\%__SRC%\bin\sto*.dll %_DEST%\bin%_EXT%\sto*.dll -..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib -..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx -..\%__SRC%\misc\*staticdatamembers.h* %_DEST%\inc%_EXT%\*staticdatamembers.h* -dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" -dos: sh -c "if test %OS% = MACOSX; then create-libstatic-link %_DEST%\lib%_EXT%; fi" linklib: libstore.so.*.*.* |