diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 15:55:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 16:34:54 +0200 |
| commit | 8dac2cc0b93d51e9b3fff652ed1f2f4730b5c1c2 (patch) | |
| tree | ef728dba0abddf65eddac1cb4d7f9509bda6212b /scp2 | |
| parent | 78d03c63890700be56144cfbafda42749cfd58d2 (diff) | |
scp2: merge explorer extension modules
Don't need to check the Windows version any more.
Change-Id: I774e68b6b3a07684e60532f9d76b9af6d2ea28cf
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_winexplorerext.mk | 4 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index bc9731878ee3..413b5287d7ee 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -49,10 +49,8 @@ $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST)) $(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)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk index 8dbaec80f417..c3da66809a4f 100644 --- a/scp2/InstallModule_winexplorerext.mk +++ b/scp2/InstallModule_winexplorerext.mk @@ -16,9 +16,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\ winexplorerextbinarytable \ winexplorerext \ - winexplorerextnt6 \ - $(if $(filter TRUE,$(BUILD_X64)), winexplorerextwin64 \ - winexplorerextwin64nt6) \ + $(if $(filter TRUE,$(BUILD_X64)),winexplorerextwin64) \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\ diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 440945e89096..d0383b6e036c 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -20,10 +20,8 @@ #include "AutoInstall/winexplorerextbinarytable" #include "AutoInstall/winexplorerext" -#include "AutoInstall/winexplorerextnt6" #ifdef BUILD_X64 #include "AutoInstall/winexplorerextwin64" -#include "AutoInstall/winexplorerextwin64nt6" #endif Module gid_Module_Optional_Winexplorerext @@ -34,7 +32,6 @@ Module gid_Module_Optional_Winexplorerext Dirs = (gid_Dir_Shlxthdl); Files = (auto_winexplorerextbinarytable_ALL, auto_winexplorerext_ALL, - auto_winexplorerextnt6_ALL, gid_File_Tmp_Userinstall_Winexplorerext_Inf); End @@ -48,7 +45,6 @@ Module gid_Module_Optional_Winexplorerext_x64 Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Shlxthdl); Files = (auto_winexplorerextwin64_ALL, - auto_winexplorerextwin64nt6_ALL, gid_File_Lib_Msvcp100, gid_File_Lib_Msvcr100, gid_File_Lib_Msvcp110, |