diff --git a/Repository.mk b/Repository.mk index 976cc8090db1..546e72f4eddf 100644 --- a/Repository.mk +++ b/Repository.mk @@ -760,18 +760,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexp shlxthdl \ )) -ifneq ($(BUILD_X64),) -$(eval $(call gb_Helper_register_packages_for_install,winexplorerextwin64, \ - $(if $(filter MSC,$(COM)),msvc_dlls) \ -)) - -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \ - ooofilt_x64 \ - propertyhdl_x64 \ - shlxthdl_x64 \ -)) -endif # BUILD_X64 - endif # WNT $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d73e6203801c..757a38162190 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -365,11 +365,6 @@ $(call gb_LinkTarget_add_libs,$(1),-lz) endef -# nothing on system -define gb_LinkTarget__use_zlib_x64 - -endef - gb_ExternalProject__use_zlib := else # !SYSTEM_ZLIB @@ -397,11 +392,6 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib) endef -define gb_LinkTarget__use_zlib_x64 -$(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64) - -endef - define gb_ExternalProject__use_zlib $(call gb_ExternalProject_use_static_libraries,$(1),zlib) @@ -537,11 +527,6 @@ $(call gb_LinkTarget__use_expat_impl,$(1),expat) endef -define gb_LinkTarget__use_expat_x64 -$(call gb_LinkTarget__use_expat_impl,$(1),expat_x64) - -endef - ifneq ($(SYSTEM_HYPH),) define gb_LinkTarget__use_hyphen diff --git a/external/expat/Module_expat.mk b/external/expat/Module_expat.mk index baac0b595e20..485e8c417659 100644 --- a/external/expat/Module_expat.mk +++ b/external/expat/Module_expat.mk @@ -20,11 +20,4 @@ $(eval $(call gb_Module_add_targets,expat,\ )) endif -# ---------------- X64 stuff special --------------------- -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,expat,\ - StaticLibrary_expat_x64 \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk deleted file mode 100644 index 97b009d87aed..000000000000 --- a/external/expat/StaticLibrary_expat_x64.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,expat_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,expat_x64,YES)) - -$(eval $(call gb_StaticLibrary_set_warnings_disabled,expat_x64)) - -$(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat)) - -$(eval $(call gb_StaticLibrary_set_include,expat_x64,\ - -I$(gb_UnpackedTarball_workdir)/expat \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_defs,expat_x64,\ - -DCOMPILED_FROM_DSP \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\ - UnpackedTarball/expat/lib/xmlparse_x64 \ - UnpackedTarball/expat/lib/xmltok_x64 \ - UnpackedTarball/expat/lib/xmlrole_x64 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 30d0e935d489..e9e4f75046f2 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -19,18 +19,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\ external/expat/expat-winapi.patch \ )) -# This is a bit hackish. - -# When building for Windows (as 32-bit) we need to build it twice: as -# 32- and 64-bit code, to be able to produce a 64-bit Explorer -# ("shell") extension that is used when the 32-bit LibreOffice is -# installed on a 64-bit OS. - -$(eval $(call gb_UnpackedTarball_set_post_action,expat,\ - $(if $(filter $(BUILD_X64),TRUE), \ - cp lib/xmlparse.c lib/xmlparse_x64.c && \ - cp lib/xmltok.c lib/xmltok_x64.c && \ - cp lib/xmlrole.c lib/xmlrole_x64.c) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk index 468cb2dea9fb..762aa77068fa 100644 --- a/external/zlib/Module_zlib.mk +++ b/external/zlib/Module_zlib.mk @@ -14,10 +14,4 @@ $(eval $(call gb_Module_add_targets,zlib,\ UnpackedTarball_zlib \ )) -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,zlib,\ - StaticLibrary_zlib_x64 \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk deleted file mode 100644 index 1f1a46fb9df8..000000000000 --- a/external/zlib/StaticLibrary_zlib_x64.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,zlib_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,zlib_x64,YES)) - -$(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib)) - -$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64)) - -$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\ - -I$(gb_UnpackedTarball_workdir)/zlib \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,zlib_x64,\ - UnpackedTarball/zlib/x64/adler32 \ - UnpackedTarball/zlib/x64/compress \ - UnpackedTarball/zlib/x64/crc32 \ - UnpackedTarball/zlib/x64/deflate \ - UnpackedTarball/zlib/x64/inffast \ - UnpackedTarball/zlib/x64/inflate \ - UnpackedTarball/zlib/x64/inftrees \ - UnpackedTarball/zlib/x64/trees \ - UnpackedTarball/zlib/x64/zutil \ -)) - -ifeq ($(ENABLE_DEBUG),TRUE) -$(eval $(call gb_StaticLibrary_add_cflags,zlib_x64,-DZLIB_DEBUG)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 185300406dc8..4f66255c8dad 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -46,9 +46,6 @@ $(eval $(call gb_AutoInstall_add_module,spsuppfiles,LIBO_LIB_FILE,LIBO_EXECUTABL $(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)) -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION,,,PACKAGE_FILELIST_COMPONENTCONDITION,"VersionNT64")) -endif $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,xsltfilter,,,,PACKAGE_FILELIST)) diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk index 296f7fccfa5b..34f1c49b7910 100644 --- a/scp2/InstallModule_windows.mk +++ b/scp2/InstallModule_windows.mk @@ -9,10 +9,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/windows)) -$(eval $(call gb_InstallModule_define_if_set,scp2/windows,\ - BUILD_X64 \ -)) - $(eval $(call gb_InstallModule_add_defs,scp2/windows,\ $(if $(WINDOWS_SDK_HOME),\ -DHAVE_WINDOWS_SDK \ diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk index c3da66809a4f..2bf2773d3514 100644 --- a/scp2/InstallModule_winexplorerext.mk +++ b/scp2/InstallModule_winexplorerext.mk @@ -9,14 +9,9 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/winexplorerext)) -$(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\ - BUILD_X64 \ -)) - $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\ winexplorerextbinarytable \ winexplorerext \ - $(if $(filter TRUE,$(BUILD_X64)),winexplorerextwin64) \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 8f507c510346..d3e136f58cf3 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -179,15 +179,6 @@ End Dir = gid_Dir_Shlxthdl; \ End -#define SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION(id,name,cond) \ - File id \ - Name = name; \ - LIB_FILE_BODY; \ - Styles = (PACKED); \ - Dir = gid_Dir_Shlxthdl_x64; \ - ComponentCondition = cond; \ - End - #ifdef MACOSX // links are created at configure time by odk/config/setsdkenv_unix.sh.in #define SDK_LIBRARY_LINK(id,name,target) @@ -418,26 +409,6 @@ 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; \ - ModuleID = gid_Module_Optional_Winexplorerext; \ - Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ - Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ - End \ -\ - RegistryItem CONCAT3(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension,_x64) \ - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ - ModuleID = gid_Module_Optional_Winexplorerext_x64; \ - ComponentCondition = "VersionNT64"; \ - 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) \ RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ @@ -446,8 +417,6 @@ End Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End -#endif - #else #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty #endif diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 3eb80bbec63b..ba9d674b0ed3 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -22,10 +22,3 @@ Directory gid_Dir_Shlxthdl ParentID = gid_Brand_Dir_Program; DosName = "shlxthdl"; End - -#ifdef BUILD_X64 -Directory gid_Dir_Shlxthdl_x64 - ParentID = gid_Dir_Shlxthdl; - DosName = "."; -End -#endif diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 2acd44c1ed89..db7ac983b2d2 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -20,9 +20,6 @@ #include "AutoInstall/winexplorerextbinarytable" #include "AutoInstall/winexplorerext" -#ifdef BUILD_X64 -#include "AutoInstall/winexplorerextwin64" -#endif Module gid_Module_Optional_Winexplorerext MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS ); @@ -34,16 +31,3 @@ Module gid_Module_Optional_Winexplorerext auto_winexplorerext_ALL, 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"; - Description = "gid_Module_Optional_Winexplorerext_x64"; - Sortkey = "1210"; - Default = YES; - Styles = (HIDDEN_ROOT); - Dirs = (gid_Dir_Shlxthdl_x64); - Files = (auto_winexplorerextwin64_ALL); -End -#endif diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index c144160f8391..5538986bc58f 100644 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -28,18 +28,6 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -48,18 +36,6 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End -#endif - RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -68,19 +44,6 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved Value = "%PRODUCTNAME Infotip Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"; - Value = "%PRODUCTNAME Infotip Handler"; -End - -#endif - // End registry items for the Infotip handler // Begin registry items for the Thumbnail viewer @@ -92,18 +55,6 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -113,19 +64,6 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer Val64 = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -134,19 +72,6 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved Value = "%PRODUCTNAME Thumbnail Viewer"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{3B092F0C-7696-40E3-A80F-68D74DA84210}"; - Value = "%PRODUCTNAME Thumbnail Viewer"; -End - -#endif - // End registry items for the Thumbnail viewer // Begin registry items for the Column handler @@ -158,18 +83,6 @@ RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60C Value = "%PRODUCTNAME Column Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; - Value = "%PRODUCTNAME Column Handler"; -End - -#endif - RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -177,18 +90,6 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -197,19 +98,6 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -218,19 +106,6 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved Value = "%PRODUCTNAME Column Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; - Value = "%PRODUCTNAME Column Handler"; -End - -#endif - // End registry items for the Column handler // Begin registry items for the MS Indexing server filter component @@ -242,18 +117,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 Value = "OpenDocument Format Filter"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; - Value = "OpenDocument Format Filter"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -262,18 +125,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -282,19 +133,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -302,18 +140,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 Value = "OpenDocument Format Persistent Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}"; - Value = "OpenDocument Format Persistent Handler"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -321,18 +147,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAd Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}"; - Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -End - -#endif - // End registry items for the MS Indexing server filter component // Begin registry entries for the PropertySheet handler @@ -344,18 +158,6 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -364,19 +166,6 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -385,19 +174,6 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved Value = "%PRODUCTNAME Property Sheet Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{63542C48-9552-494A-84F7-73AA6A7C99C1}"; - Value = "%PRODUCTNAME Property Sheet Handler"; -End - -#endif - // End registry entries for the PropertySheet handler // Begin registry entries for the Property handler @@ -417,26 +193,6 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareD Value = "#1"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}"; - Value = "%PRODUCTNAME Property Handler"; -End - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}"; - Name = "EnableShareDenyNone"; - Value = "#1"; -End - -#endif - RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -444,18 +200,6 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -464,19 +208,6 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -485,17 +216,4 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved Value = "%PRODUCTNAME Property Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{AE424E85-F6DF-4910-A6A9-438797986431}"; - Value = "%PRODUCTNAME Property Handler"; -End - -#endif - // End registry entries for the Property handler diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk deleted file mode 100644 index b5aa0397ae4f..000000000000 --- a/shell/CustomTarget_x64.mk +++ /dev/null @@ -1,69 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,shell/source)) - -SHELL_SHLXTHANDLER_COMMON_FILES := \ - win32/ooofilereader/autostyletag \ - win32/ooofilereader/basereader \ - win32/ooofilereader/contentreader \ - win32/ooofilereader/keywordstag \ - win32/ooofilereader/metainforeader \ - win32/ooofilereader/simpletag \ - win32/shlxthandler/ooofilt/stream_helper \ - win32/shlxthandler/util/fileextensions \ - win32/shlxthandler/util/iso8601_converter \ - win32/shlxthandler/util/registry \ - win32/shlxthandler/util/utilities \ - win32/zipfile/zipexcptn \ - win32/zipfile/zipfile - -SHELL_SHLXTHDL_FILES := \ - win32/shlxthandler/classfactory \ - win32/shlxthandler/columninfo/columninfo \ - win32/shlxthandler/infotips/infotips \ - win32/shlxthandler/propsheets/document_statistic \ - win32/shlxthandler/propsheets/listviewbuilder \ - win32/shlxthandler/propsheets/propsheets \ - win32/shlxthandler/shlxthdl \ - win32/shlxthandler/thumbviewer/thumbviewer - -SHELL_OOOFILT_FILES := \ - win32/shlxthandler/ooofilt/ooofilt \ - win32/shlxthandler/ooofilt/propspec - -SHELL_PROPERTYHDL_FILES := \ - win32/shlxthandler/prophdl/propertyhdl - -SHELL_XMLPARSER_FILES := \ - all/xml_parser - -SHELL_HEADERS := \ - win32/ooofilereader/autostyletag \ - win32/ooofilereader/dummytag \ - win32/ooofilereader/itag \ - win32/ooofilereader/keywordstag \ - win32/ooofilereader/simpletag \ - win32/shlxthandler/classfactory \ - win32/shlxthandler/ooofilt/ooofilt \ - win32/shlxthandler/ooofilt/propspec \ - win32/shlxthandler/propsheets/document_statistic \ - win32/shlxthandler/propsheets/listviewbuilder \ - win32/zipfile/zipexcptn - -$(call gb_CustomTarget_get_target,shell/source) : \ - $(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) $(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) $(SHELL_XMLPARSER_FILES),\ - $(gb_CustomTarget_workdir)/shell/source/$(source).cxx) \ - $(foreach header,$(SHELL_HEADERS),\ - $(gb_CustomTarget_workdir)/shell/source/$(header).hxx) - -$(gb_CustomTarget_workdir)/shell/source/% : $(SRCDIR)/shell/source/% - mkdir -p $(dir $@) && $(call gb_Deliver_deliver,$<,$@) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk deleted file mode 100644 index a09f89214f48..000000000000 --- a/shell/Library_ooofilt_x64.mk +++ /dev/null @@ -1,66 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Library_Library,ooofilt_x64)) - -$(eval $(call gb_Library_set_x64,ooofilt_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,ooofilt_x64,\ - shell/source \ -)) - -$(eval $(call gb_Library_set_include,ooofilt_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_add_defs,ooofilt_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ - -UNOMINMAX \ -)) - -$(eval $(call gb_Library_use_externals,ooofilt_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\ - advapi32 \ - comctl32 \ - gdi32 \ - gdiplus \ - kernel32 \ - msvcprt \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - propsys \ - shell32 \ - user32 \ - uuid \ -)) - -$(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ - shell_xmlparser_x64 \ - shlxthandler_common_x64 \ -)) - -$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ - /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/ooofilt/ooofilt.def \ - /NODEFAULTLIB:libcmt.lib \ -)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,ooofilt_x64,\ - CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ - CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk deleted file mode 100644 index 5736f2152a11..000000000000 --- a/shell/Library_propertyhdl_x64.mk +++ /dev/null @@ -1,66 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Library_Library,propertyhdl_x64)) - -$(eval $(call gb_Library_set_x64,propertyhdl_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,propertyhdl_x64,\ - shell/source \ -)) - -$(eval $(call gb_Library_set_include,propertyhdl_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_add_defs,propertyhdl_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ - -UNOMINMAX \ -)) - -$(eval $(call gb_Library_use_externals,propertyhdl_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\ - advapi32 \ - comctl32 \ - gdi32 \ - gdiplus \ - kernel32 \ - msvcprt \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - propsys \ - shell32 \ - shlwapi \ - user32 \ - uuid \ -)) - -$(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ - shell_xmlparser_x64 \ - shlxthandler_common_x64 \ -)) - -$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ - /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/prophdl/propertyhdl.def \ - /NODEFAULTLIB:libcmt.lib \ -)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,propertyhdl_x64,\ - CustomTarget/shell/source/win32/shlxthandler/prophdl/propertyhdl \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk deleted file mode 100644 index 3501d46c3239..000000000000 --- a/shell/Library_shlxthdl_x64.mk +++ /dev/null @@ -1,74 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Library_Library,shlxthdl_x64)) - -$(eval $(call gb_Library_set_x64,shlxthdl_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,shlxthdl_x64,\ - shell/source \ -)) - -$(eval $(call gb_Library_set_include,shlxthdl_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_add_defs,shlxthdl_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ - -UNOMINMAX \ -)) - -$(eval $(call gb_Library_use_externals,shlxthdl_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\ - advapi32 \ - comctl32 \ - gdi32 \ - gdiplus \ - kernel32 \ - msvcprt \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - shell32 \ - shlwapi \ - user32 \ - uuid \ -)) - -$(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\ - shlxthandler_common_x64 \ - shell_xmlparser_x64 \ -)) - -$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl)) - -$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ - /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/shlxthdl.def \ - /NODEFAULTLIB:libcmt.lib \ -)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,shlxthdl_x64,\ - CustomTarget/shell/source/win32/shlxthandler/classfactory \ - CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \ - CustomTarget/shell/source/win32/shlxthandler/infotips/infotips \ - CustomTarget/shell/source/win32/shlxthandler/propsheets/document_statistic \ - CustomTarget/shell/source/win32/shlxthandler/propsheets/listviewbuilder \ - CustomTarget/shell/source/win32/shlxthandler/propsheets/propsheets \ - CustomTarget/shell/source/win32/shlxthandler/shlxthdl \ - CustomTarget/shell/source/win32/shlxthandler/thumbviewer/thumbviewer \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 220f27ebe7ac..58a598714a05 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -74,16 +74,6 @@ $(eval $(call gb_Module_add_check_targets,shell,\ )) endif -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,shell,\ - CustomTarget_x64 \ - Library_ooofilt_x64 \ - Library_propertyhdl_x64 \ - Library_shlxthdl_x64 \ - StaticLibrary_shlxthandler_common_x64 \ - StaticLibrary_xmlparser_x64 \ -)) -endif ifneq ($(CXX_X64_BINARY),) $(eval $(call gb_Module_add_targets,shell,\ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk deleted file mode 100644 index 2f906c516e68..000000000000 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,shlxthandler_common_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,shlxthandler_common_x64,YES)) - -$(eval $(call gb_StaticLibrary_use_custom_headers,shlxthandler_common_x64,\ - shell/source \ -)) - -$(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ -)) - -$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shlxthandler_common_x64,\ - CustomTarget/shell/source/win32/ooofilereader/autostyletag \ - CustomTarget/shell/source/win32/ooofilereader/basereader \ - CustomTarget/shell/source/win32/ooofilereader/contentreader \ - CustomTarget/shell/source/win32/ooofilereader/keywordstag \ - CustomTarget/shell/source/win32/ooofilereader/metainforeader \ - CustomTarget/shell/source/win32/ooofilereader/simpletag \ - CustomTarget/shell/source/win32/shlxthandler/ooofilt/stream_helper \ - CustomTarget/shell/source/win32/shlxthandler/util/fileextensions \ - CustomTarget/shell/source/win32/shlxthandler/util/iso8601_converter \ - CustomTarget/shell/source/win32/shlxthandler/util/registry \ - CustomTarget/shell/source/win32/shlxthandler/util/utilities \ - CustomTarget/shell/source/win32/zipfile/zipexcptn \ - CustomTarget/shell/source/win32/zipfile/zipfile \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk deleted file mode 100644 index e52e5a373633..000000000000 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,shell_xmlparser_x64,YES)) - -$(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\ - expat_x64 \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\ - CustomTarget/shell/source/all/xml_parser \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py index d42e8ae96ace..f4af6cc62c4a 100644 --- a/solenv/gbuild/gen-autoinstall.py +++ b/solenv/gbuild/gen-autoinstall.py @@ -71,7 +71,7 @@ print(", \\\n".join([" " + gid for gid in allgids])) for (gid, link, target) in autosdklibs: print("SDK_LIBRARY_LINK(" + gid + "," + link + "," + target + ")") -scp2libtemplates = set([ "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE", "SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION" ]) +scp2libtemplates = set([ "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE" ]) for (gid, libfile) in autolibs: if scp2libtemplate not in scp2libtemplates: raise Exception("invalid scp2libtemplate \"" + scp2libtemplate + "\"")