diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 /scp2/inc | |
| parent | 18041138d3169d565755565bdbabd8de596b5ac7 (diff) | |
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.
Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'scp2/inc')
| -rwxr-xr-x | scp2/inc/macros.inc | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 6a4b19a8d6a5..fabb82ddb4d8 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -75,6 +75,26 @@ #define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,.dll)) #endif +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share + #define GID_DIR_PY gid_Brand_Dir_Share + #define GID_DIR_URE gid_Dir_Bundle_Contents + #define GID_DIR_URE_BIN gid_Brand_Dir_Program + #define GID_DIR_URE_JAVA gid_Dir_Classes + #define GID_DIR_URE_LIB gid_Dir_Frameworks + #define GID_DIR_URE_SHARE gid_Brand_Dir_Share_Ure + #define GID_DIR_URE_SHARE_MISC gid_Brand_Dir_Share_Ure +#else + #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program + #define GID_DIR_PY gid_Brand_Dir_Program + #define GID_DIR_URE gid_Dir_Common_Ure + #define GID_DIR_URE_BIN gid_Dir_Ure_Bin + #define GID_DIR_URE_JAVA gid_Dir_Ure_Java + #define GID_DIR_URE_LIB gid_Dir_Ure_Lib + #define GID_DIR_URE_SHARE gid_Dir_Ure_Share + #define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc +#endif + #define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res)) #define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) #define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang)) @@ -84,6 +104,12 @@ #define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + #define SCP2_OOO_LIB_DIR gid_Dir_Frameworks +#else + #define SCP2_OOO_LIB_DIR SCP2_OOO_BIN_DIR +#endif + #define BIN_FILE_BODY \ UnixRights = 755 @@ -117,7 +143,7 @@ #define PACKED_LIB_FILE_BODY \ LIB_FILE_BODY; \ Styles = (PACKED); \ - Dir = SCP2_OOO_BIN_DIR + Dir = SCP2_OOO_LIB_DIR #define LIBO_LIB_FILE(id,name) \ File id \ @@ -190,6 +216,13 @@ PACKED_LIB_FILE_BODY; \ End +#define STD_PY_FILE(id,name) \ + File id \ + PACKED_TXT_FILE_BODY; \ + Dir = GID_DIR_PY; \ + Name = name; \ + End + // --------------------------------------- #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ @@ -396,7 +429,7 @@ End #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_Ure_Lib +#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 @@ -410,7 +443,7 @@ End "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v #define SCP2_URE_DL_UNO_COMID_NORMAL(n) \ "libuno_" n STRING(COMID) STRING(UNXSUFFIX) -#define SCP2_URE_SHARE_DIR gid_Dir_Ure_Share +#define SCP2_URE_SHARE_DIR GID_DIR_URE_SHARE #endif #if defined MACOSX #define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib" |