diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-12 09:32:40 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-04-12 10:20:46 +0200 |
| commit | f74e372ac65f8f8337b5723b7629daa4d3f14371 (patch) | |
| tree | 0eeed28dc80bb3e4d608230c9ca0e5ce57430c22 | |
| parent | b2dbd828b98a5e2e63c20ac4684df6cf22aec7f7 (diff) | |
Remove more code using M1310 and M1400.
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 68 | ||||
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 2 |
2 files changed, 1 insertions, 69 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5f34ebc8d810..5da35aef8b1d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -793,23 +793,6 @@ File gid_Brand_File_Lib_Mingwm10 End #endif -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Lib_Msvcr80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcr80.dll"; -#else - Name = "msvcr80d.dll"; -#endif -End -#endif -#endif -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) @@ -836,57 +819,6 @@ End #endif -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Lib_Msvcp80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcp80.dll"; -#else - Name = "msvcp80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Lib_Msvcm80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcm80.dll"; -#else - Name = "msvcm80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Msvcm80crt_Manifest - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "Microsoft.VC80.CRT.manifest"; -#else - Name = "Microsoft.VC80.DebugCRT.manifest"; -#endif -End -#endif -#endif -#endif - // Profiles Profile gid_Brand_Profile_Bootstrap_Ini diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 676a97f3a3b0..36fbd06743d8 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -868,7 +868,7 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); #endif #endif -#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) || defined (M1600) ) +#elif defined WNT && (defined(M1500) || defined (M1600) ) #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); #else |