summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscp2/inc/macros.inc6
-rw-r--r--scp2/source/base/registryitem_base.scp2
-rw-r--r--scp2/source/calc/registryitem_calc.scp9
-rw-r--r--scp2/source/draw/registryitem_draw.scp8
-rw-r--r--scp2/source/impress/registryitem_impress.scp8
-rw-r--r--scp2/source/javafilter/file_javafilter.scp2
-rw-r--r--scp2/source/math/registryitem_math.scp4
-rw-r--r--scp2/source/ooo/file_library_ooo.scp21
-rw-r--r--scp2/source/ooo/makefile.mk7
-rw-r--r--scp2/source/ooo/windowscustomaction_ooo.scp8
-rwxr-xr-xscp2/source/winexplorerext/makefile.mk3
-rw-r--r--scp2/source/writer/registryitem_writer.scp15
-rw-r--r--scp2/util/makefile.mk13
13 files changed, 86 insertions, 20 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 5efd89665601..2c20cb096484 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -489,6 +489,8 @@ End
// ---------------------------------------
+#ifdef _MSC_VER
+
#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
@@ -500,6 +502,10 @@ End
Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
End
+#else
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty
+#endif
+
// ---------------------------------------
#if defined WNT
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 833ed3905241..abd35eeab36b 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -94,6 +94,7 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,13";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odb_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -101,6 +102,7 @@ RegistryItem gid_Regitem_odb_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_Databasedocument_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 8220610ec5c3..19d4ba192820 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -504,6 +504,7 @@ RegistryItem gid_Regitem_Stc_Contenttype
Value = "application/vnd.sun.xml.calc.template";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_stc_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -511,6 +512,7 @@ RegistryItem gid_Regitem_stc_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_Sxc_Contenttype
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -545,6 +547,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxc_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -552,7 +555,7 @@ RegistryItem gid_Regitem_sxc_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 ods file extension
@@ -665,6 +668,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,3";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_ods_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -672,6 +676,7 @@ RegistryItem gid_Regitem_ods_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_Calcdocument_1_Insertable
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -856,6 +861,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
Value = "<progpath>\program\soffice.exe,4";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_ots_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -863,6 +869,7 @@ RegistryItem gid_Regitem_ots_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_Calctemplate_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index d722319649cd..561dbf11ca9b 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -476,6 +476,7 @@ RegistryItem gid_Regitem_Std_Contenttype
Value = "application/vnd.sun.xml.draw.template";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_std_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -483,6 +484,7 @@ RegistryItem gid_Regitem_std_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_Sxd_PersistentHandler
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -544,6 +546,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxd_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -551,6 +554,7 @@ RegistryItem gid_Regitem_sxd_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 odg file extension
@@ -663,6 +667,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,5";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odg_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -670,6 +675,7 @@ RegistryItem gid_Regitem_odg_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_Drawdocument_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -854,6 +860,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
Value = "<progpath>\program\soffice.exe,6";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_otg_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -861,6 +868,7 @@ RegistryItem gid_Regitem_otg_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_Drawtemplate_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
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 = "<progpath>\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 = "<progpath>\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;
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index a6d3f3329b25..e9eb2d1fbabd 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -38,7 +38,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Jfregca
TXT_FILE_BODY;
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index b58e15e5265e..449a6c6ce4d2 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -436,6 +436,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxm_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -443,6 +444,7 @@ RegistryItem gid_Regitem_sxm_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 odf file extension
@@ -547,6 +549,7 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,14";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odf_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -554,6 +557,7 @@ RegistryItem gid_Regitem_odf_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_Mathdocument_1_Insertable
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3ea5298909b1..04026ae95b76 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -780,7 +780,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_sn_tools
BIN_FILE_BODY;
@@ -802,7 +802,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Rebasemsi
TXT_FILE_BODY;
@@ -811,7 +811,7 @@ File gid_File_Lib_Rebasemsi
Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
-#endif
+#endif /* WNT && HAVE_WINDOWS_SDK */
STD_LIB_FILE( gid_File_Lib_Lng, lng)
@@ -1091,7 +1091,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Reg4allmsdoc
TXT_FILE_BODY;
@@ -1100,10 +1100,6 @@ File gid_File_Lib_Reg4allmsdoc
Name = "reg4allmsdoc.dll";
End
-#endif
-
-#ifdef WNT
-
File gid_File_Lib_Qslnkmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
@@ -1111,9 +1107,6 @@ File gid_File_Lib_Qslnkmsi
Name = "qslnkmsi.dll";
End
-#endif
-
-#ifdef WNT
File gid_File_Lib_Sdqsmsi
TXT_FILE_BODY;
@@ -1122,7 +1115,7 @@ File gid_File_Lib_Sdqsmsi
Name = "sdqsmsi.dll";
End
-#endif
+#endif /* WNT && HAVE_WINDOWS_SDK */
File gid_File_Lib_Res
Name = LIBNAME(res);
@@ -1854,13 +1847,15 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
File gid_File_Lib_sellangmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = gid_Dir_Program;
Name = "sellangmsi.dll";
End
+
#endif
#ifdef ENABLE_LOMENUBAR
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index a3fcd6aa64ce..53f4f9d5c301 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -212,7 +212,7 @@ SCPDEFS+=-DSYSTEM_NEON
.ENDIF
# if yes or unset (neon not used) -> do not install openssl library!
-.IF $(SYSTEM_OPENSSL) != "YES"
+.IF "$(SYSTEM_OPENSSL)" != "YES"
SCPDEFS+=-DOPENSSL
.ENDIF
@@ -288,6 +288,11 @@ SCPDEFS+=-DSYSTEM_LIBGSF
SCPDEFS+=-DENABLE_LOMENUBAR
.ENDIF
+# Synchronize with condition to build the jfregqa.dll custom action in setup_native
+.IF "$(WINDOWS_SDK_HOME)"!=""
+SCPDEFS+=-DHAVE_WINDOWS_SDK
+.ENDIF
+
SCP_PRODUCT_TYPE=osl
ICUVERSION_DEPENDENT_FILES= \
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index f35482e4dd39..70197b77504d 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -99,6 +99,8 @@ WindowsCustomAction gid_Customaction_Reg64dll2
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end");
End
+#ifdef HAVE_WINDOWS_SDK
+
WindowsCustomAction gid_Customaction_Jfregcadll1
Name = "Jfregcadll1";
Typ = "65";
@@ -135,6 +137,8 @@ WindowsCustomAction gid_Customaction_qslnkmsidll
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "sdqsmsidll");
End
+#endif /* HAVE_WINDOWS_SDK */
+
WindowsCustomAction gid_Customaction_Shellextensionsdll1
Name = "Shellextensionsdll1";
Typ = "65";
@@ -449,6 +453,8 @@ WindowsCustomAction gid_Customaction_CompleteInstallPath
Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
End
+#ifdef HAVE_WINDOWS_SDK
+
WindowsCustomAction gid_Customaction_CheckVersions
Name = "CheckVersions";
Typ = "321";
@@ -495,3 +501,5 @@ WindowsCustomAction gid_Customaction_RegisterSomeExtensions
Inbinarytable = 1;
Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1");
End
+
+#endif /* HAVE_WINDOWS_SDK */
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 435ed439987d..0c193c21538a 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -43,7 +43,8 @@ SCPDEFS+=-DBUILD_X64
SCP_PRODUCT_TYPE=osl
-.IF "$(GUI)"=="WNT"
+# The Explorer extensions don't build with MinGW
+.IF "$(GUI)" == "WNT" && "$(COM)" == "MSC"
PARFILES= \
module_winexplorerext.par \
file_winexplorerext.par \
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 6e3d9741430b..ef4020351a5a 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -546,6 +546,7 @@ RegistryItem gid_Regitem_Stw_Contenttype
Value = "application/vnd.sun.xml.writer.template";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_stw_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -553,6 +554,7 @@ RegistryItem gid_Regitem_stw_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_Sxg_PersistentHandler
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -598,6 +600,7 @@ RegistryItem gid_Regitem_Sxg_Mime_Database
Value = ".sxg";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxg_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -605,6 +608,7 @@ RegistryItem gid_Regitem_sxg_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_Sxw_PersistentHandler
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -666,6 +670,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxw_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -673,7 +678,7 @@ RegistryItem gid_Regitem_sxw_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 odt file extension
@@ -792,6 +797,7 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
Subkey = "opendocument.WriterDocument.1\Insertable";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odt_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -799,6 +805,7 @@ RegistryItem gid_Regitem_odt_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_Writerdocument_1_Protocol_Stdfileediting_Server
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1000,6 +1007,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
Value = "<progpath>\program\soffice.exe,2";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_ott_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -1007,6 +1015,7 @@ RegistryItem gid_Regitem_ott_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_Writertemplate_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1124,6 +1133,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,10";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odm_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -1131,6 +1141,7 @@ RegistryItem gid_Regitem_odm_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_Writerglobaldocument_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1290,6 +1301,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_oth_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -1297,6 +1309,7 @@ RegistryItem gid_Regitem_oth_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
// "OpenWith" Windows Registry keys for extensions supported by Writer
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index ee6d0adcb05f..adc03b783da8 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -168,10 +168,15 @@ SCP1FILES += \
folderitem_math.par \
module_quickstart.par \
file_quickstart.par \
- registryitem_quickstart.par \
+ registryitem_quickstart.par
+
+# The Explorer extensions don't build with MinGW
+.IF "$(COM)" == "MSC"
+SCP1FILES += \
module_winexplorerext.par \
file_winexplorerext.par \
registryitem_winexplorerext.par
+.ENDIF
.IF "$(ENABLE_DIRECTX)"!=""
SCP1FILES += directxcanvas.par
@@ -353,10 +358,14 @@ SCP2FILES += \
folderitem_math.par \
module_quickstart.par \
file_quickstart.par \
- registryitem_quickstart.par \
+ registryitem_quickstart.par
+
+.IF "$(COM)" == "MSC"
+SCP2FILES += \
module_winexplorerext.par \
file_winexplorerext.par \
registryitem_winexplorerext.par
+.ENDIF
.IF "$(ENABLE_DIRECTX)"!=""
SCP2FILES += directxcanvas.par
generated by cgit (git 2.34.1) at 2024-08-13 17:33:43 +0000