[Libreoffice-commits] .: 2 commits - scp2/source

[Fridrich Strba]

 scp2/source/ooo/ure.scp |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 7f1d77d9fecdd710d2b2fd17be91a61665baf846
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 18 15:13:15 2012 +0100

    If COM==_MSC, then OS==WNT and also GUI==WNT

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a7cafa8..d17c0b7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 File gid_File_Dl_Cli_Uno
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno
 End
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Cli_Ure_Assembly
     TXT_FILE_BODY;
@@ -466,7 +466,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Ure_Assembly
     TXT_FILE_BODY;
@@ -483,7 +483,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC 
+#if defined _MSC 
 
 File gid_File_Dl_Policy_Cli_Ure_Config
     TXT_FILE_BODY;
@@ -495,7 +495,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Cli_Basetypes_Assembly
     TXT_FILE_BODY;
@@ -512,7 +512,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Basetypes_Assembly
     TXT_FILE_BODY;
@@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 End
 
 #endif
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Basetypes_Config
     TXT_FILE_BODY;
@@ -541,7 +541,7 @@ End
 #endif
 
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Cli_Uretypes_Assembly
     TXT_FILE_BODY;
@@ -558,7 +558,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Uretypes_Assembly
     TXT_FILE_BODY;
@@ -575,7 +575,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC 
+#if defined _MSC 
 
 File gid_File_Dl_Policy_Cli_Uretypes_Config
     TXT_FILE_BODY;
@@ -587,7 +587,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Lib_Cli_Cppuhelper_Assembly
     TXT_FILE_BODY;
@@ -604,7 +604,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
     TXT_FILE_BODY;
@@ -621,7 +621,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Lib_Policy_Cli_Cppuhelper_Config
     TXT_FILE_BODY;
@@ -868,7 +868,7 @@ File gid_File_Dl_Stlport
     Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
 #endif
 #endif
-#elif defined WNT && defined _MSC
+#elif defined _MSC
 #if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else
commit aa318df8355334811649055494a03d6336becf66
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 18 15:08:02 2012 +0100

    Package stlport on Windows when requested (fdo#37561)

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index aece726..a7cafa8 100644
--- 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 && ((_MSC_VER == 1500) || (_MSC_VER == 1600))
+#elif defined WNT && defined _MSC
 #if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else