diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-17 14:30:51 +0200 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-06-20 06:49:12 +0200 |
commit | 76b037180cba4e0c275560a7f7829bc820eb6ad6 (patch) | |
tree | 5a055197739b7ba314b43adf5412fe781ad70fe2 /shell | |
parent | 1e5933f0e60ca44e908a4aab81fd8802f234b081 (diff) |
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>
Reviewed-on: https://gerrit.libreoffice.org/72501
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit d35eec7b26c7807092b78144b6c71639b9439612)
Reviewed-on: https://gerrit.libreoffice.org/74406
Diffstat (limited to 'shell')
-rw-r--r-- | shell/CustomTarget_x64.mk | 8 | ||||
-rw-r--r-- | shell/Library_spsupp_x64.mk | 11 | ||||
-rw-r--r-- | shell/source/win32/spsupp/COMOpenDocuments_x64.cxx | 13 | ||||
-rw-r--r-- | shell/source/win32/spsupp/registrar_x64.cxx | 13 | ||||
-rw-r--r-- | shell/source/win32/spsupp/spsuppClassFactory_x64.cxx | 13 | ||||
-rw-r--r-- | shell/source/win32/spsupp/spsuppServ_x64.cxx | 13 |
6 files changed, 58 insertions, 13 deletions
diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk index 42dd36c03edb..79dcde80d0e3 100644 --- a/shell/CustomTarget_x64.mk +++ b/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) diff --git a/shell/Library_spsupp_x64.mk b/shell/Library_spsupp_x64.mk index 4b29f27e31d2..4b36a6c8d105 100644 --- a/shell/Library_spsupp_x64.mk +++ b/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 \ )) @@ -40,11 +39,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: diff --git a/shell/source/win32/spsupp/COMOpenDocuments_x64.cxx b/shell/source/win32/spsupp/COMOpenDocuments_x64.cxx new file mode 100644 index 000000000000..2a155fefa303 --- /dev/null +++ b/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: */ diff --git a/shell/source/win32/spsupp/registrar_x64.cxx b/shell/source/win32/spsupp/registrar_x64.cxx new file mode 100644 index 000000000000..18372bb27cf3 --- /dev/null +++ b/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: */ diff --git a/shell/source/win32/spsupp/spsuppClassFactory_x64.cxx b/shell/source/win32/spsupp/spsuppClassFactory_x64.cxx new file mode 100644 index 000000000000..099a305d9d27 --- /dev/null +++ b/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: */ diff --git a/shell/source/win32/spsupp/spsuppServ_x64.cxx b/shell/source/win32/spsupp/spsuppServ_x64.cxx new file mode 100644 index 000000000000..41046bf13d53 --- /dev/null +++ b/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: */ |