diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:22:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:22:58 +0000 |
| commit | 476ea8100eedce3a93ed6ec5b0f6c6b38df2e6f5 (patch) | |
| tree | 8669381bf4763f99131140eecea53a2a35702292 /scp2/inc | |
| parent | c2b4ae23b8a92b0df4caa94314490450f9ba199d (diff) | |
INTEGRATION: CWS sb83 (1.16.100); FILE MERGED
2008/03/17 09:01:25 sb 1.16.100.4: RESYNC: (1.16-1.17); FILE MERGED
2008/02/13 12:49:06 is 1.16.100.3: #i86068# language specific files in brand package
2008/01/29 16:00:16 sb 1.16.100.2: #i85112# merged in cws_src680_native121
2007/12/03 13:44:04 sb 1.16.100.1: #i84200# Use new feature of automatically merged adjacent string literals.
Diffstat (limited to 'scp2/inc')
| -rw-r--r-- | scp2/inc/macros.inc | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 3ec9c248832a..2534636603be 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -162,6 +162,14 @@ Styles = (PACKED); \ End +#define BRAND_RES_FILE(id,name) \ + File id \ + TXT_FILE_BODY; \ + RESFILE_ALL_LANG(name); \ + Dir = gid_Brand_Dir_Resource; \ + Styles = (PACKED); \ + End + #define STD_RES_FILE_PATCH(id,name) \ File id \ TXT_FILE_BODY; \ @@ -384,23 +392,25 @@ End #if defined WNT -#define SCP2_URE_DL_DIR gid_Dir_Bin -#define SCP2_URE_DL_NORMAL(n) STRING(CONCAT2(n, .dll)) -#define SCP2_URE_DL_BARE(n) STRING(CONCAT2(n, .dll)) -#define SCP2_URE_DL_VER(n, v) STRING(CONCAT3(n, v, .dll)) -#define SCP2_URE_DL_COMID_VER(n, v) STRING(CONCAT4(n, v, COMID, .dll)) -#define SCP2_URE_DL_UNO_VER(n, v) STRING(CONCAT3(n, v, .dll)) -#define SCP2_URE_DL_UNO_COMID_VER(n, v) STRING(CONCAT4(n, v, COMID, .dll)) -#define SCP2_URE_SHARE_DIR PREDEFINED_PROGDIR +#define SCP2_URE_DL_DIR gid_Dir_Ure_Bin +#define SCP2_URE_DL_NORMAL(n) n ".dll" +#define SCP2_URE_DL_BARE(n) n ".dll" +#define SCP2_URE_DL_VER(n, v) n v ".dll" +#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll" +#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 #else -#define SCP2_URE_DL_DIR gid_Dir_Lib -#define SCP2_URE_DL_NORMAL(n) STRING(CONCAT3(lib, n, UNXSUFFIX)) -#define SCP2_URE_DL_BARE(n) STRING(CONCAT2(n, UNXSUFFIX)) -#define SCP2_URE_DL_VER(n, v) STRING(CONCAT5(lib, n, UNXSUFFIX, ., v)) -#define SCP2_URE_DL_COMID_VER(n, v) STRING(CONCAT6(lib, n, COMID, UNXSUFFIX, ., v)) -#define SCP2_URE_DL_UNO_VER(n, v) STRING(CONCAT5(libuno_, n, UNXSUFFIX, ., v)) -#define SCP2_URE_DL_UNO_COMID_VER(n, v) STRING(CONCAT6(libuno_, n, COMID, UNXSUFFIX, ., v)) -#define SCP2_URE_SHARE_DIR gid_Dir_Share +#define SCP2_URE_DL_DIR gid_Dir_Ure_Lib +#define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX) +#define SCP2_URE_DL_BARE(n) n STRING(UNXSUFFIX) +#define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v +#define SCP2_URE_DL_COMID_VER(n, v) \ + "lib" n STRING(COMID) STRING(UNXSUFFIX) "." v +#define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v +#define SCP2_URE_DL_UNO_COMID_VER(n, v) \ + "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v +#define SCP2_URE_SHARE_DIR gid_Dir_Ure_Share #endif #include <langmacros.inc> |