[Libreoffice-commits] .: scp2/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Apr 12 01:21:02 PDT 2011
scp2/source/ooo/common_brand.scp | 68 ---------------------------------------
scp2/source/ooo/ure.scp | 2 -
2 files changed, 1 insertion(+), 69 deletions(-)
New commits:
commit 80d4842faf3fd0eaa39e16190bcb622ca1d0f8f3
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date: Tue Apr 12 09:32:40 2011 +0200
Remove more code using M1310 and M1400.
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5f34ebc..5da35ae 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 676a97f..36fbd06 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
More information about the Libreoffice-commits
mailing list