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/AutoInstall.mk | |
| parent | solenv: installer: remove DONT_DELETE style (diff) | |
| download | core-8dac2cc0b93d51e9b3fff652ed1f2f4730b5c1c2.tar.gz core-8dac2cc0b93d51e9b3fff652ed1f2f4730b5c1c2.zip | |
scp2: merge explorer extension modules
Don't need to check the Windows version any more.
Change-Id: I774e68b6b3a07684e60532f9d76b9af6d2ea28cf
Diffstat (limited to 'scp2/AutoInstall.mk')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 |
1 files changed, 0 insertions, 2 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)) |