diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-19 10:13:24 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-19 10:14:55 +0100 |
| commit | ad4c61397da8fee3b341eec9d4ca7df574dfe60f (patch) | |
| tree | 2bfe277925eca8e562806bf81f8c0ca66a08cab0 /scp2 | |
| parent | 91609fe9d83aed2547ebb3c4aa48202f56c54dbc (diff) | |
fix names of libraries for MinGW, also remove onlinecheck.dll
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 12 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 8 |
4 files changed, 7 insertions, 23 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4f23947e6097..c0f2eff6f7b6 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -511,26 +511,20 @@ End #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" #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" #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure +#if defined _MSC +#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #if defined _DEBUG_RUNTIME #define SCP2_STDLP_DEBUG "d" #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_URE_DL_UNO_COMID_VER(n, v) n STRING(COMID) ".dll" #define SCP2_STDLP_DEBUG "" #endif #else diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 7b20c242bd32..74c83f94bdd9 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1479,15 +1479,6 @@ STD_LIB_FILE( gid_File_Lib_Updchkui , updchk ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) -#ifdef WNT -File gid_File_Lib_Onlinecheck - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "onlinecheck.dll"; -End -#endif - #ifndef SYSTEM_OPENSSL File gid_File_Lib_Openssl LIB_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 024ec681bca4..8a3889f06479 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -482,7 +482,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Svtmisc, gid_File_Lib_Updchkui, gid_File_Lib_Updatefeed, - gid_File_Lib_Onlinecheck, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Config); diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 18df366ad3bd..09d27aaf4dfd 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -191,7 +191,11 @@ End File gid_File_Dl_Cppuhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined WNT && !defined _MSC // Hack for not gbuild'ified cppuhelper on MinGW: + Name = "uno_cppuhelpergcc33.dll" +#else Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3"); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964"; End @@ -252,11 +256,7 @@ End File gid_File_Dl_Salhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; -#if defined WNT && !defined _MSC // Hack for gbuild'ified salhelper on MinGW: - Name = "uno_salhelpergcc3.dll" -#else Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3"); -#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5"; End |