diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 23:42:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-30 11:13:32 +0300 |
| commit | e081225623ee71557d28afe9a1fbeeeb80faa798 (patch) | |
| tree | 297bb7c3f4ca48a5d12bbe5e2fc52acd662861f1 /scp2 | |
| parent | c908467f098bf1e8be7c5d7fddaf66c5506675af (diff) | |
Tweak some DLL and import library names in the WNTGCC case
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 677bf2843386..5efd89665601 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -506,6 +506,7 @@ End #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" +#if defined _MSC #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_COMID_NORMAL(n) n STRING(COMID) ".dll" @@ -517,6 +518,16 @@ End #else #define SCP2_STDLP_DEBUG "" #endif +#else // GCC +#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_COMID_NORMAL(n) n STRING(COMID) ".dll" +#define SCP2_URE_DL_UNO_VER(n, v) "uno_" n v ".dll" +#define SCP2_URE_DL_UNO_COMID_VER(n, v) \ + "uno_" n STRING(COMID) v ".dll" +#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure +#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) |