diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-19 10:13:24 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-19 10:14:55 +0100 |
| commit | ad4c61397da8fee3b341eec9d4ca7df574dfe60f (patch) | |
| tree | 2bfe277925eca8e562806bf81f8c0ca66a08cab0 /scp2/inc/macros.inc | |
| parent | 91609fe9d83aed2547ebb3c4aa48202f56c54dbc (diff) | |
fix names of libraries for MinGW, also remove onlinecheck.dll
Diffstat (limited to 'scp2/inc/macros.inc')
| -rwxr-xr-x | scp2/inc/macros.inc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4f23947e6097..c0f2eff6f7b6 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -511,26 +511,20 @@ 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" #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 _MSC +#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #if defined _DEBUG_RUNTIME #define SCP2_STDLP_DEBUG "d" #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_URE_DL_UNO_COMID_VER(n, v) n STRING(COMID) ".dll" #define SCP2_STDLP_DEBUG "" #endif #else |