diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 18:05:23 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 20:39:01 +0300 |
| commit | 4639374b16b3f9f32ece3e10cb5908b104bf2765 (patch) | |
| tree | e3bbd66afe242e8f682967e21bec591ef0c230bb /scp2 | |
| parent | MinGW cross-compilation improvements (diff) | |
| download | core-4639374b16b3f9f32ece3e10cb5908b104bf2765.tar.gz core-4639374b16b3f9f32ece3e10cb5908b104bf2765.zip | |
mingwm10.dll is obsolete
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 10 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 13 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 11 |
5 files changed, 0 insertions, 39 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 6809f7422b7d..f17655978db8 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -78,7 +78,6 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Dbghelp, gid_Brand_File_Lib_Mingw_GccS, gid_Brand_File_Lib_Mingw_Stdcpp, - gid_Brand_File_Lib_Mingwm10, gid_Brand_File_Lib_Msvcr80, gid_Brand_File_Lib_Msvcp80, gid_Brand_File_Lib_Msvcm80, @@ -780,15 +779,6 @@ End #endif -#if defined WNT && defined(_gcc3) -File gid_Brand_File_Lib_Mingwm10 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; - Name = "mingwm10.dll"; -End -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b1ef33b565f4..3ea5298909b1 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -908,19 +908,6 @@ STD_LIB_FILE(gid_File_Lib_ooxml,ooxml) STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok) -#ifdef WNT -#if defined(_gcc3) - -File gid_File_Lib_Mingwm10 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; - Name = "mingwm10.dll"; -End - -#endif -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index b718738776a4..273f8021052c 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -456,7 +456,6 @@ Module gid_Module_Root_Files_5 GID_FILE_LIB_WPD, gid_File_Lib_Mingw_GccS, gid_File_Lib_Mingw_Stdcpp, - gid_File_Lib_Mingwm10, gid_File_Lib_Msvcp70, gid_File_Lib_Msvcr70, gid_File_Lib_Ole, diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 768460ef6065..13a1316a352b 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -52,10 +52,6 @@ ScpAction scp_Copy_Readme_Txt End #if defined(WNT) && defined(_gcc3) -ScpAction SCP_COPY_MINGWM10 - Copy = "mingwm10.dll"; - Name = "mingwm10.dll"; -End #if defined(MINGW_GCCDLL) ScpAction SCP_COPY_MINGW_GCCS Copy = MINGW_GCCDLL; diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 6d61daff3df0..33ea472c93ac 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -910,16 +910,6 @@ File gid_File_Dl_Stdcpp End #endif -#if (defined WNT && defined _gcc3) -File gid_File_Lib_Mingwm10_Ure - TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("mingwm10"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "601FEC1D-8665-4476-9911-83BDCCE83025"; -End -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) @@ -1147,7 +1137,6 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_Stdcpp, gid_File_Lib_Mingw_GccS_Ure, gid_File_Lib_Mingw_Stdcpp_Ure, - gid_File_Lib_Mingwm10_Ure, gid_File_Dl_Unicows, gid_File_Dl_Uwinapi, gid_File_Lib_Msvcr80_Ure, |