common_brand.scp (910823ae) common_brand.scp (1076d7f7)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 44 unchanged lines hidden (view full) ---

53 gid_Brand_File_Bin_Soffice_Bin,
54 gid_Brand_File_Bin_Soffice_Bin_Manifest,
55 gid_Brand_File_Bin_Spadmin,
56 gid_Brand_File_Bin_Unoinfo,
57 gid_Brand_File_Bin_Unopkgcom,
58 gid_Brand_File_Bin_Unopkgexe,
59 gid_Brand_File_Bin_Unopkg,
60 gid_Brand_File_Bin_Msvcr71,
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 44 unchanged lines hidden (view full) ---

53 gid_Brand_File_Bin_Soffice_Bin,
54 gid_Brand_File_Bin_Soffice_Bin_Manifest,
55 gid_Brand_File_Bin_Spadmin,
56 gid_Brand_File_Bin_Unoinfo,
57 gid_Brand_File_Bin_Unopkgcom,
58 gid_Brand_File_Bin_Unopkgexe,
59 gid_Brand_File_Bin_Unopkg,
60 gid_Brand_File_Bin_Msvcr71,
61 gid_Brand_File_Bin_Libxml2,
61 // gid_Brand_File_Bin_Libxml2,
62 gid_Brand_File_Bmp_IntroAbout,
63 gid_Brand_File_Desktophelper_Txt,
64 gid_Brand_File_Images_Brand_Zip,
65 gid_Brand_File_Lib_Dbghelp,
66 gid_Brand_File_Lib_Mingw_GccS,
67 gid_Brand_File_Lib_Mingw_Stdcpp,
68 gid_Brand_File_Lib_Mingwm10,
69 gid_Brand_File_Lib_Msvcr80,

--- 367 unchanged lines hidden (view full) ---

437End
438#endif
439
440// Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
441// from a Windows system directory instead of the one from the URE; to avoid
442// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
443// the OOo executables (where it takes precedence even over DLLs from the
444// Windows system directory):
62 gid_Brand_File_Bmp_IntroAbout,
63 gid_Brand_File_Desktophelper_Txt,
64 gid_Brand_File_Images_Brand_Zip,
65 gid_Brand_File_Lib_Dbghelp,
66 gid_Brand_File_Lib_Mingw_GccS,
67 gid_Brand_File_Lib_Mingw_Stdcpp,
68 gid_Brand_File_Lib_Mingwm10,
69 gid_Brand_File_Lib_Msvcr80,

--- 367 unchanged lines hidden (view full) ---

437End
438#endif
439
440// Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
441// from a Windows system directory instead of the one from the URE; to avoid
442// problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
443// the OOo executables (where it takes precedence even over DLLs from the
444// Windows system directory):
445#if defined WNT && !defined SYSTEM_LIBXML
446File gid_Brand_File_Bin_Libxml2
447 TXT_FILE_BODY;
448 Dir = gid_Brand_Dir_Program;
449#if defined _gcc3
450 Name = SCP2_URE_DL_NORMAL("libxml2-2");
451#else
452 Name = SCP2_URE_DL_NORMAL("libxml2");
453#endif
454 Styles = (PACKED);
455End
456#endif
445//#if defined WNT && !defined SYSTEM_LIBXML
446//File gid_Brand_File_Bin_Libxml2
447// TXT_FILE_BODY;
448// Dir = gid_Brand_Dir_Program;
449//#if defined _gcc3
450// Name = SCP2_URE_DL_NORMAL("libxml2-2");
451//#else
452// Name = SCP2_URE_DL_NORMAL("libxml2");
453//#endif
454// Styles = (PACKED);
455//End
456//#endif
457
458File gid_Brand_File_Bmp_IntroAbout
459 TXT_FILE_BODY;
460 Dir = gid_Brand_Dir_Program;
461 Name = "intro.zip";
462 Styles = (ARCHIVE);
463End
464

--- 892 unchanged lines hidden --- 		457
458File gid_Brand_File_Bmp_IntroAbout
459 TXT_FILE_BODY;
460 Dir = gid_Brand_Dir_Program;
461 Name = "intro.zip";
462 Styles = (ARCHIVE);
463End
464

--- 892 unchanged lines hidden ---