diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:13:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:13:17 +0000 |
| commit | fedd92a1d6b286827fa282ff86f6b620e983ff14 (patch) | |
| tree | ec4638e876c9a96a1385a9125e9816a3b347811f /scp2 | |
| parent | 0d67d2909d1bd061fa87fde674a36562a2c2b023 (diff) | |
INTEGRATION: CWS sb88 (1.18.70); FILE MERGED
2008/06/06 08:33:55 sb 1.18.70.2: #i89507# take care of .jnilib vs. .dylib feature of MACOSX
2008/05/15 10:06:45 sb 1.18.70.1: #i88329# move just-for-moz msvcp71.dll/msvcr71.dll from URE to Basis layer
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/inc/macros.inc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 2534636603be..a9b1292011a4 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -400,6 +400,11 @@ #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll" #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure +#if defined _STLP_DEBUG +#define SCP2_STDLP_DEBUG "d" +#else +#define SCP2_STDLP_DEBUG "" +#endif #else #define SCP2_URE_DL_DIR gid_Dir_Ure_Lib #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX) @@ -412,6 +417,11 @@ "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v #define SCP2_URE_SHARE_DIR gid_Dir_Ure_Share #endif +#if defined MACOSX +#define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib" +#else +#define SCP2_URE_JDL_NORMAL(n) SCP2_URE_DL_NORMAL(n) +#endif #include <langmacros.inc> |