Make spsupp_x64 independent of shell/CustomTarget_x64

... in preparation for further changes.
Thanks to Noel Grandin for the hint!

Change-Id: I2b223322d1d42099b56a74a92e3c39631d6b581c
Reviewed-on: https://gerrit.libreoffice.org/72470
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

shell/CustomTarget_x64.mk

@@ -44,12 +44,6 @@ SHELL_PROPERTYHDL_FILES := \
 SHELL_XMLPARSER_FILES := \
 	all/xml_parser
 
-SHELL_SPSUPP_FILES := \
-    win32/spsupp/COMOpenDocuments \
-    win32/spsupp/registrar \
-    win32/spsupp/spsuppClassFactory \
-    win32/spsupp/spsuppServ
-
 SHELL_HEADERS := \
 	win32/ooofilereader/autostyletag \
 	win32/ooofilereader/dummytag \
@@ -64,7 +58,7 @@ SHELL_HEADERS := \
 	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) $(SHELL_SPSUPP_FILES),\
+	$(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) $(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) $(SHELL_XMLPARSER_FILES),\
 		$(call gb_CustomTarget_get_workdir,shell/source)/$(source).cxx) \
 	$(foreach header,$(SHELL_HEADERS),\
 		$(call gb_CustomTarget_get_workdir,shell/source)/$(header).hxx)

shell/Library_spsupp_x64.mk

@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,spsupp_x64))
 $(eval $(call gb_Library_set_x64,spsupp_x64,YES))
 
 $(eval $(call gb_Library_use_custom_headers,spsupp_x64,\
-	shell/source \
 	shell/source/win32/spsupp/idl \
 ))
 
@@ -35,11 +34,11 @@ $(eval $(call gb_Library_add_ldflags,spsupp_x64,\
 	/DEF:$(SRCDIR)/shell/source/win32/spsupp/spsupp.def \
 ))
 
-$(eval $(call gb_Library_add_x64_generated_exception_objects,spsupp_x64,\
-    CustomTarget/shell/source/win32/spsupp/COMOpenDocuments \
-    CustomTarget/shell/source/win32/spsupp/registrar \
-    CustomTarget/shell/source/win32/spsupp/spsuppClassFactory \
-    CustomTarget/shell/source/win32/spsupp/spsuppServ \
+$(eval $(call gb_Library_add_exception_objects,spsupp_x64,\
+    shell/source/win32/spsupp/COMOpenDocuments_x64 \
+    shell/source/win32/spsupp/registrar_x64 \
+    shell/source/win32/spsupp/spsuppClassFactory_x64 \
+    shell/source/win32/spsupp/spsuppServ_x64 \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

shell/source/win32/spsupp/COMOpenDocuments_x64.cxx

@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* 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/.
+*/
+
+// A stub for generating x64 DLL without the need to copy source files to a temporary directory
+#include "COMOpenDocuments.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/win32/spsupp/registrar_x64.cxx

@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* 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/.
+*/
+
+// A stub for generating x64 DLL without the need to copy source files to a temporary directory
+#include "registrar.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/win32/spsupp/spsuppClassFactory_x64.cxx

@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* 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/.
+*/
+
+// A stub for generating x64 DLL without the need to copy source files to a temporary directory
+#include "spsuppClassFactory.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/win32/spsupp/spsuppServ_x64.cxx

@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* 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/.
+*/
+
+// A stub for generating x64 DLL without the need to copy source files to a temporary directory
+#include "spsuppServ.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

solenv/gbuild/LinkTarget.mk

@@ -1410,7 +1410,6 @@ endef
 # call gb_LinkTarget_add_x64_generated_cobjects,linktarget,sourcefiles,cflags,linktargetmakefilename
 define gb_LinkTarget_add_x64_generated_cobjects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3),$(4)))
-$(foreach obj,$(2),$(eval $(call gb_GenCObject_get_target,$(obj)) : CXXOBJECT_X64 := YES))
 endef
 
 # call gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,cxxflags,linktargetmakefilename

solenv/gbuild/platform/com_MSC_class.mk

@@ -39,7 +39,7 @@ define gb_CObject__command_pattern
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	unset INCLUDE && \
-	$(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), \
+	$(if $(filter YES,$(LIBRARY_X64)), $(CXX_X64_BINARY), \
 		$(if $(filter YES,$(PE_X86)), $(CXX_X86_BINARY), \
 			$(if $(filter %.c,$(3)), $(gb_CC), \
 				$(if $(filter -clr,$(2)), \
@@ -57,7 +57,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(PCHFLAGS) \
 		$(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \
 		$(INCLUDE) \
-		$(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \
+		$(if $(filter YES,$(LIBRARY_X64)), -U_X86_ -D_AMD64_,) \
 		$(if $(filter YES,$(PE_X86)), -D_X86_ -U_AMD64_,) \
 		-c $(3) \
 		-Fo$(1)) $(if $(filter $(true),$(6)),/link /DEBUG:FASTLINK) \