From 9bd564366cc381038143f3f17b23ecec9c695153 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Wed, 27 Aug 2008 13:49:23 +0000
Subject: INTEGRATION: CWS native186_DEV300 (1.8.182); FILE MERGED 2008/08/20
 09:57:50 sb 1.8.182.1: #i92939# moved shlxthdl.dll into a fresh directory
 program/shlxthdl of its own, together with an additional copy of the stlport
 dll, so that all dependencies of shlxthdl.dll are found when it is loaded by
 Windows Explorer

---
 scp2/source/winexplorerext/file_winexplorerext.scp | 32 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'scp2/source/winexplorerext/file_winexplorerext.scp')

diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 2458e7738e1b..a6df4db02fe9 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: file_winexplorerext.scp,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,13 +30,41 @@
 
 #include "macros.inc"
 
+Directory gid_Dir_Shlxthdl
+    ParentID = gid_Dir_Program;
+    DosName = "shlxthdl";
+End
+
 File gid_File_Lib_Shlxthdl
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = gid_Dir_Shlxthdl;
     Name = "shlxthdl.dll";
 End
 
+#if !defined USE_SYSTEM_STL
+File gid_File_Lib_Shlxthdl_Stlport
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Shlxthdl;
+#if defined _gcc3 /* && defined WNT */
+#if defined _STLP_DEBUG
+    Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
+#else
+    Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
+#endif
+#elif (defined(M1310) || defined(M1400) || defined(M1500)) /* && defined WNT */
+#if defined _STLP_DEBUG
+    Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
+#else
+    Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
+#endif
+#else
+#error "stlport dynamic library: unsupported platform"
+#endif
+    Styles = (PACKED);
+End
+#endif
+
 File gid_File_Lib_Shlxtmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-- 
cgit