diff options
Diffstat (limited to 'scp2/source/ooo/ure.scp')
| -rw-r--r-- | scp2/source/ooo/ure.scp | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index ae538f342ed0..cb143ae92276 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -36,23 +36,10 @@ Directory gid_Dir_Common_Ure End #endif -#if defined MACOSX -#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE -Directory gid_Dir_UreLink - ParentID = gid_Dir_Bundle_Contents; - DosName = "ure-link"; -End -#endif -#endif - -#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if !defined MACOSX Directory gid_Dir_Ure_Bin -#if defined MACOSX - ParentID = gid_Dir_UreLink; -#else ParentID = gid_Dir_Common_Ure; -#endif DosName = "bin"; End @@ -85,11 +72,11 @@ Directory gid_Dir_Ure_Java End #endif -#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#endif // !MACOSX #if !defined WNT Directory gid_Dir_Ure_Share_Misc -#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if defined MACOSX ParentID = gid_Brand_Dir_Share_Ure_Share; #else ParentID = gid_Dir_Ure_Share; @@ -161,18 +148,18 @@ End // We set up the URE unorc/uno.ini in scp2 because then it is easy to // get the platform differences into it compared to constructing it in -// Makefiles etc. With ENABLE_MACOSX_MACLIKE_APP_STRUCTURE it goes into -// .app/Contents/Resources/ure/unorc, on Unix into .../ure/lib/unorc -// and on Windows into .../ure/bin/unorc. The latter two locations -// are factored out as SCP2_URE_DL_DIR. +// Makefiles etc. On OS X it goes into .app/Contents/Resources/ure/unorc, +// on other Unix into .../ure/lib/unorc and on Windows into +// .../ure/bin/unorc. The latter two locations are factored out as +// SCP2_URE_DL_DIR. // FIXME: remove this completely? // currently getting 'destination' at file not unique error on WNT -// but needs handling of ENABLE_MACOSX_MACLIKE_APP_STRUCTURE then... +// but needs handling of MACOSX then... #ifndef WNT Profile gid_Profile_Dl_Uno_Ini ModuleID = gid_Module_Root_Ure_Hidden; -#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if defined MACOSX Dir = gid_Brand_Dir_Share_Ure; #else Dir = SCP2_URE_DL_DIR; @@ -185,7 +172,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir ProfileID = gid_Profile_Dl_Uno_Ini; Section = "Bootstrap"; Key = "URE_INTERNAL_LIB_DIR"; -#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if defined MACOSX Value = "${ORIGIN}/../../Frameworks"; #else Value = "${ORIGIN}"; @@ -197,7 +184,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir ProfileID = gid_Profile_Dl_Uno_Ini; Section = "Bootstrap"; Key = "URE_INTERNAL_JAVA_DIR"; -#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if defined MACOSX Value = "${ORIGIN}/../java"; #elif defined WNT Value = "${ORIGIN}/../java"; @@ -219,7 +206,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types ProfileID = gid_Profile_Dl_Uno_Ini; Section = "Bootstrap"; Key = "UNO_TYPES"; -#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE +#if defined MACOSX Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}"; #elif defined WNT Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}"; |