From 64914e407ccac91fbbaa5022a6854be9a01027f8 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 27 Sep 2014 14:05:28 -0500 Subject: vs2012 express support. vs2012 express does not have atl so one need to --disable-atl and --disable-activex but then the packaging still try to include a few _x64.dll that are not built. Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6 --- scp2/inc/macros.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'scp2/inc') diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d9bcf20f14e0..8ea47d98e6ab 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -427,6 +427,8 @@ End #ifdef _MSC_VER +#ifdef BUILD_X64 + #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ @@ -444,6 +446,18 @@ End Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End +#else +#endif + +#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ + RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ + ModuleID = gid_Module_Optional_Winexplorerext; \ + ComponentCondition = "VersionNT >= 600"; \ + Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ + Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ + End + #else #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty #endif -- cgit