diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:41:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:41:18 +0000 |
| commit | 630e43f19c9a6548175d1b8cc91de6493461fb35 (patch) | |
| tree | e31d0a6096d326a5d8e97dd848b45b3017238e03 /odk/source | |
| parent | dcf0a2fee68e00fd22208b060725bf180ce614fb (diff) | |
INTEGRATION: CWS jsc21 (1.6.2); FILE MERGED
2008/06/27 08:49:55 jsc 1.6.2.1: #i90032# adapt link flags and linking for MacOS
Diffstat (limited to 'odk/source')
| -rw-r--r-- | odk/source/unoapploader/unx/unoapploader.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index 323c15c12f78..e66a8585e656 100644 --- a/odk/source/unoapploader/unx/unoapploader.c +++ b/odk/source/unoapploader/unx/unoapploader.c @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoapploader.c,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -62,6 +62,7 @@ const char* PATHSEPARATOR = ":"; * the modified LD_LIBRARY_PATH environment variable. The application's * executable name must be the same as the name of this executable, prefixed * by '_'.</p> + * <p>On MACOSX DYLD_LIBRARY_PATH is used instead of LD_LIBRARY_PATH!<p> * * <p>A UNO installation can be specified by the user by setting the UNO_PATH * environment variable to the program directory of the UNO installation. @@ -83,8 +84,11 @@ int main( int argc, char *argv[] ) if ( path != NULL ) { +#ifdef MACOSX + static const char* ENVVARNAME = "DYLD_LIBRARY_PATH"; +#else static const char* ENVVARNAME = "LD_LIBRARY_PATH"; - +#endif char * libpath; int freeLibpath; |