Commits

Anonymous committed 8864950

CWS-TOOLING: integrate CWS sb98_DEV300

Comments (0)

Files changed (1)

scp2/source/ooo/common_brand.scp

              gid_Brand_File_Bin_Unopkgexe,
              gid_Brand_File_Bin_Unopkg,
              gid_Brand_File_Bin_Msvcr71,
+             gid_Brand_File_Bin_Libxml2,
              gid_Brand_File_Bmp_IntroAbout,
              gid_Brand_File_C05_Zip_Faq,
              gid_Brand_File_C05_Zip_Register,
 End
 #endif
 
+// Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
+// from a Windows system directory instead of the one from the URE; to avoid
+// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
+// the OOo executables (where it takes precedence even over DLLs from the
+// Windows system directory):
+#if defined WNT && !defined SYSTEM_LIBXML
+File gid_Brand_File_Bin_Libxml2
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+#if defined _gcc3
+    Name = SCP2_URE_DL_NORMAL("libxml2-2");
+#else
+    Name = SCP2_URE_DL_NORMAL("libxml2");
+#endif
+    Styles = (PACKED);
+End
+#endif
+
 #if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
 File gid_Brand_File_Lib_Npsoplugin
     BIN_FILE_BODY;