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/AutoInstall.mk

@@ -35,8 +35,10 @@ $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_J
 $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600"))
+ifeq ($(BUILD_X64),TRUE)
 $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
+endif
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
 
 # vim: set noet sw=4 ts=4:

scp2/InstallModule_winexplorerext.mk

@@ -13,8 +13,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
 	winexplorerextbinarytable \
 	winexplorerext \
 	winexplorerextnt6 \
-	winexplorerextwin64 \
-	winexplorerextwin64nt6 \
+	$(if $(filter TRUE,$(BUILD_X64)), winexplorerextwin64 \
+	winexplorerextwin64nt6) \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\

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

scp2/source/winexplorerext/module_winexplorerext.scp

@@ -21,8 +21,10 @@
 #include "AutoInstall/winexplorerextbinarytable"
 #include "AutoInstall/winexplorerext"
 #include "AutoInstall/winexplorerextnt6"
+#ifdef BUILD_X64
 #include "AutoInstall/winexplorerextwin64"
 #include "AutoInstall/winexplorerextwin64nt6"
+#endif
 
 Module gid_Module_Optional_Winexplorerext
     MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
@@ -37,6 +39,7 @@ Module gid_Module_Optional_Winexplorerext
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
 End
 
+#ifdef BUILD_X64
 Module gid_Module_Optional_Winexplorerext_x64
     ParentID = gid_Module_Optional_Winexplorerext;
     Name = "gid_Module_Optional_Winexplorerext_x64";
@@ -52,3 +55,4 @@ Module gid_Module_Optional_Winexplorerext_x64
              gid_File_Lib_Msvcp110,
              gid_File_Lib_Msvcr110);
 End
+#endif