diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-02 21:12:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-02 22:23:50 +0200 |
| commit | b2193386ddd6ffbf45ef05f5fcd44db5fe6b4ae9 (patch) | |
| tree | 5a74a5e24b1eb5fc55a467c3ab76dee8d7ecdac2 /scp2/source | |
| parent | 625c378b0d42bb251c5cabdc84fe92193bd2a8a4 (diff) | |
scp2: move winexplorerext libs to AutoInstall
Change-Id: I93d08ab46e401a2f37c9ad6e425e8014c7e05db1
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 57 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 17 |
2 files changed, 10 insertions, 64 deletions
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 65ebc524414f..c7fcd69298cf 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -23,63 +23,6 @@ Directory gid_Dir_Shlxthdl DosName = "shlxthdl"; End -File gid_File_Lib_OOoFilt - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "ooofilt.dll"; -End - -#ifdef BUILD_X64 - -File gid_File_Lib_OOoFilt64 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "ooofilt_x64.dll"; - ComponentCondition = "VersionNT64"; -End - -#endif - -File gid_File_Lib_Shlxthdl - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "shlxthdl.dll"; -End - -#ifdef BUILD_X64 - File gid_File_Lib_Shlxthdl64 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "shlxthdl_x64.dll"; - ComponentCondition = "VersionNT64"; -End - -#endif - -File gid_File_Lib_PropertyHdl - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "propertyhdl.dll"; - ComponentCondition = "VersionNT >= 600"; - -End - -#ifdef BUILD_X64 - File gid_File_Lib_PropertyHdl64 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "propertyhdl_x64.dll"; - ComponentCondition = "VersionNT64 >= 600"; -End - -#endif - #ifdef BUILD_X64 #if defined(WITH_VC100_REDIST) diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index dbed4cfdb2dd..2be352372cea 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -17,7 +17,12 @@ */ #include "macros.inc" + #include "AutoInstall/winexplorerextbinarytable" +#include "AutoInstall/winexplorerext" +#include "AutoInstall/winexplorerextnt6" +#include "AutoInstall/winexplorerextwin64" +#include "AutoInstall/winexplorerextwin64nt6" Module gid_Module_Optional_Winexplorerext MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS ); @@ -26,10 +31,9 @@ Module gid_Module_Optional_Winexplorerext Minimal = YES; ParentID = gid_Module_Optional; Dirs = (gid_Dir_Shlxthdl); - Files = (auto_winexplorerextbinarytable_ALL - gid_File_Lib_Shlxthdl, - gid_File_Lib_OOoFilt, - gid_File_Lib_PropertyHdl, + Files = (auto_winexplorerextbinarytable_ALL, + auto_winexplorerext_ALL, + auto_winexplorerextnt6_ALL, gid_File_Tmp_Userinstall_Winexplorerext_Inf); End @@ -41,9 +45,8 @@ Module gid_Module_Optional_Winexplorerext_x64 Default = YES; Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Shlxthdl); - Files = (gid_File_Lib_Shlxthdl64, - gid_File_Lib_OOoFilt64, - gid_File_Lib_PropertyHdl64, + Files = (auto_winexplorerextwin64_ALL, + auto_winexplorerextwin64nt6_ALL, gid_File_Lib_Msvcp100, gid_File_Lib_Msvcr100, gid_File_Lib_Msvcp110, |