Get macOS building and packaging again. Following changes/fixes:

o Stop pretending/forcing *Nix shared lib versioning on macOS
o Use smaller and more easily manageable temp temps by leveraging --headerpad dyld option
o misc gbuild fixes

2 files changed, 38 insertions, 0 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 467dee59034c..8149cd7975dc 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -548,6 +548,8 @@ End
 #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_COMID_NORMAL(n) \
+    "lib" n STRING(COMID) STRING(UNXSUFFIX)
 #define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
 #define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
 #define SCP2_URE_DL_UNO_COMID_VER(n, v)	\
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a4399d63f6b5..30f0599e02d7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -190,7 +190,11 @@ End
 File gid_File_Dl_Cppu
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+    Name = SCP2_URE_DL_UNO_NORMAL("cppu");
+#else
     Name = SCP2_URE_DL_UNO_VER("cppu", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
@@ -200,8 +204,12 @@ File gid_File_Dl_Cppuhelper
 #ifdef OS2
     Name = "cppuh3.dll";
 #else
+#if defined MACOSX
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 #endif
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
@@ -211,15 +219,23 @@ File gid_File_Dl_PurpEnvHelper
 #ifdef OS2
     Name = "purpeh3.dll";
 #else
+#if defined MACOSX
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
 #endif
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
 File gid_File_Dl_Sal
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+    Name = SCP2_URE_DL_UNO_NORMAL("sal");
+#else
     Name = SCP2_URE_DL_UNO_VER("sal", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
@@ -229,8 +245,12 @@ File gid_File_Dl_Salhelper
 #ifdef OS2
     Name = "salhelp3.dll";
 #else
+#if defined MACOSX
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
 #endif
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
@@ -239,14 +259,22 @@ End
 File gid_File_Dl_Reg
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+    Name = SCP2_URE_DL_NORMAL("reg");
+#else
     Name = SCP2_URE_DL_VER("reg", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
 File gid_File_Dl_Store
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+    Name = SCP2_URE_DL_NORMAL("store");
+#else
     Name = SCP2_URE_DL_VER("store", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
@@ -267,15 +295,23 @@ File gid_File_Dl_Jvmaccess
 #ifdef OS2
     Name = "jvmacces.dll";
 #else
+#if defined MACOSX
+    Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess");
+#else
     Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
 #endif
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
 File gid_File_Dl_Jvmfwk
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#if defined MACOSX
+    Name = SCP2_URE_DL_NORMAL("jvmfwk");
+#else
     Name = SCP2_URE_DL_VER("jvmfwk", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End