diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-02 18:12:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 15:19:55 +0100 |
| commit | 827430c8c0417396b3c1d2a049ccddb818c89646 (patch) | |
| tree | 2b249c14dcbfb725469b4dd70c125d00486d2a84 /scp2/inc | |
| parent | 1924d05e706e6308b4de3b6103ebb73976866d66 (diff) | |
Fold URE: Windows
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.
Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
Diffstat (limited to 'scp2/inc')
| -rw-r--r-- | scp2/inc/macros.inc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index cccf0d495be5..6f8e6ab086de 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -65,19 +65,10 @@ #ifdef MACOSX #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share #define GID_DIR_PY gid_Brand_Dir_Share - #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 #else #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program #define GID_DIR_PY gid_Brand_Dir_Program -#if defined UNX - #define GID_DIR_URE_BIN gid_Brand_Dir_Program - #define GID_DIR_URE_JAVA gid_Dir_Classes -#else - #define GID_DIR_URE_BIN gid_Dir_Ure_Bin - #define GID_DIR_URE_JAVA gid_Dir_Ure_Java -#endif #define GID_DIR_URE_LIB gid_Brand_Dir_Program #endif @@ -246,7 +237,7 @@ End File id \ TXT_FILE_BODY; \ Name = name; \ - Dir = GID_DIR_URE_JAVA; \ + Dir = gid_Dir_Classes; \ Styles = (PACKED); \ End @@ -463,9 +454,8 @@ End #endif - +#define SCP2_URE_DL_DIR GID_DIR_URE_LIB #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" #define SCP2_URE_DL_VER(n, v) n v ".dll" @@ -474,7 +464,6 @@ End #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" #else -#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 @@ -536,7 +525,7 @@ End #define URE_EXECUTABLE(id,name) \ File id \ BIN_FILE_BODY; \ - Dir = GID_DIR_URE_BIN; \ + Dir = gid_Brand_Dir_Program; \ Name = name; \ Styles = (PACKED); \ End |