diff options
Diffstat (limited to 'scp2/inc/macros.inc')
| -rwxr-xr-x | scp2/inc/macros.inc | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 677bf2843386..8b96b8852394 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -92,10 +92,10 @@ #endif #define BIN_FILE_BODY \ - UnixRights = 555 + UnixRights = 755 #define TXT_FILE_BODY \ - UnixRights = 444 + UnixRights = 644 #define USER_FILE_BODY \ UnixRights = 644 @@ -489,6 +489,8 @@ End // --------------------------------------- +#ifdef _MSC_VER + #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ @@ -500,12 +502,17 @@ End Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End +#else +#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty +#endif + // --------------------------------------- #if defined WNT #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 +524,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) |