From bf3ff35d8c96315c35cf8dc8495be4b488b55cb6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 30 Aug 2011 10:47:54 +0300 Subject: Adapt for MinGW cross-builds Adapt some of the DLL names to match conventions we currently use in a MinGW build. If those are changed to be exactly like when built with MSVC (for SDK ABI stability reasons), will have to change here, too. Bypass stuff that we can't build with MinGW when necessary. Should be synchronized with the corresponding makefiles, obviously. We can't currently build the Explorer extension or MSI installer custom actions with MinGW due to lack of some required headers and/or import libraries. --- scp2/source/impress/registryitem_impress.scp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scp2/source/impress') diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index ead060392fbb..7b26fc580bc9 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -490,6 +490,7 @@ RegistryItem gid_Regitem_Sti_Contenttype Value = "application/vnd.sun.xml.impress.template"; End +#ifdef _MSC_VER RegistryItem gid_Regitem_sti_FullDetails ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; @@ -497,6 +498,7 @@ RegistryItem gid_Regitem_sti_FullDetails Name = "FullDetails"; Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; End +#endif RegistryItem gid_Regitem_Sxi_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -558,6 +560,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Styles = (); End +#ifdef _MSC_VER RegistryItem gid_Regitem_sxi_FullDetails ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; @@ -565,6 +568,7 @@ RegistryItem gid_Regitem_sxi_FullDetails Name = "FullDetails"; Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; End +#endif // new odp file extension @@ -678,6 +682,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon Value = "\program\soffice.exe,7"; End +#ifdef _MSC_VER RegistryItem gid_Regitem_odp_FullDetails ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; @@ -685,6 +690,7 @@ RegistryItem gid_Regitem_odp_FullDetails Name = "FullDetails"; Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; End +#endif RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -883,6 +889,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon Value = "\program\soffice.exe,8"; End +#ifdef _MSC_VER RegistryItem gid_Regitem_otp_FullDetails ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl; @@ -890,6 +897,7 @@ RegistryItem gid_Regitem_otp_FullDetails Name = "FullDetails"; Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName"; End +#endif RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell ParentID = PREDEFINED_HKEY_CLASSES_ROOT; -- cgit