diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-17 23:17:37 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-16 23:56:21 +0200 |
| commit | 03ce1e85428d4a273910bf7ca758ce050e95720c (patch) | |
| tree | 71cf2ceaaf4e83953f3b37d74ac61a100e776bcf /solenv | |
| parent | e6dfaf9f44f9939abc338c83b3024108431d0f69 (diff) | |
configure + gbuild: handle Windows Arm64
Change-Id: Idfc20c1234d693d6b402158b8bc782bd17cd3f4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102850
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_ARM64_MSC.mk | 27 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/WNT_ARM64_MSC.mk b/solenv/gbuild/platform/WNT_ARM64_MSC.mk new file mode 100644 index 000000000000..67e1d5736736 --- /dev/null +++ b/solenv/gbuild/platform/WNT_ARM64_MSC.mk @@ -0,0 +1,27 @@ +# -*- 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# + +gb_CPPU_ENV := msca +gb_CPUDEFS := -D_ARM64_=1 + +include $(GBUILDDIR)/platform/com_MSC_defs.mk + +include $(GBUILDDIR)/platform/com_MSC_class.mk + +# vim: set noet sw=4: diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index c27fc0c95446..d69f7f46004d 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -189,7 +189,7 @@ cat $${RESPONSEFILE} | sed 's/ /\n/g' | grep -v '^$$' > $${RESPONSEFILE}.1 && \ mv $${RESPONSEFILE}.1 $${RESPONSEFILE} && endef -MSC_SUBSYSTEM_VERSION=$(COMMA)6.01 +MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter ARM64,$(CPUNAME)),6.02,6.01) # the sort on the libraries is used to filter out duplicates to keep commandline # length in check - otherwise the dupes easily hit the limit when linking mergedlib diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index e30c5ad54455..14763e6dd4ea 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -47,6 +47,7 @@ gb_MSBUILD_CONFIG := $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) gb_MSBUILD_PLATFORM := $(strip \ $(if $(filter INTEL,$(CPUNAME)),Win32) \ $(if $(filter X86_64,$(CPUNAME)),x64) \ + $(if $(filter ARM64,$(CPUNAME)),ARM64) \ ) gb_MSBUILD_CONFIG_AND_PLATFORM := \ /p:Configuration=$(gb_MSBUILD_CONFIG) \ |