diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp deleted file mode 100755 index b19ca8c47bba..000000000000 --- a/scp2/source/ooo/mergemodules_ooo.scp +++ /dev/null @@ -1,56 +0,0 @@ -/************************************************************************* -* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * -************************************************************************/ - -#include "macros.inc" - -#ifdef M1500 -MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86 -#ifdef _DEBUG_RUNTIME - Name = "Microsoft_VC90_DebugCRT_x86.msm"; -#else - Name = "Microsoft_VC90_CRT_x86.msm"; -#endif - Cabfilename = "openoffice.org-vc90crt.cab"; - Feature = "gm_Root"; - RootDir = "TARGETDIR"; - Styles = (REMOVE_FILE_TABLE); -End -#endif - -#ifdef M1500 -MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86 -#ifdef _DEBUG_RUNTIME - Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"; -#else - Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; -#endif - Cabfilename = "openoffice.org-policy-vc90crt.cab"; - Feature = "gm_Root"; - RootDir = "TARGETDIR"; - Styles = (REMOVE_FILE_TABLE); -End -#endif diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 36fbd06743d8..6d61daff3df0 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(M1500) || defined (M1600) ) +#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600)) #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); #else