diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-15 07:45:22 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-15 08:42:54 +0200 |
| commit | 63cf188ce0a47ddc162c4e4207a35d4d22f2662e (patch) | |
| tree | eb93504cfaf9b7f256a25b3c88bce1213dc027f1 /external/python3 | |
| parent | 937b780e3f696552fc686bf0c80c3050443b111a (diff) | |
WIN add and apply default msbuild platform+config
Adds three Windows gb_* variables:
- gb_MSBUILD_CONFIG_AND_PLATFORM can be passed as msbuild flags
- gb_MSBUILD_PLATFORM maps debug / release settings
- gb_MSBUILD_CONFIG maps the CPUTYPE to the default msbuild names
and converts the users in external projects.
Change-Id: Ie9b817721180d78d104db11c44241e4b3e46bba9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102701
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external/python3')
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 2bc7d86c0678..ad110bbbc817 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -30,20 +30,12 @@ ifeq ($(OS),WNT) # TODO: using Debug configuration and related mangling of pyconfig.h -python3_WIN_PLATFORM_MSBUILD := $(strip \ - $(if $(filter INTEL,$(CPUNAME)),Win32) \ - $(if $(filter X86_64,$(CPUNAME)),x64) \ - $(if $(filter ARM64,$(CPUNAME)),arm64) \ - ) - # at least for MSVC 2008 it is necessary to clear MAKEFLAGS because # nmake is invoked $(call gb_ExternalProject_get_state_target,python3,build) : $(call gb_Trace_StartRange,python3,EXTERNAL) $(call gb_ExternalProject_run,build,\ - MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \ - /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - /p:Platform=$(python3_WIN_PLATFORM_MSBUILD) \ + MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build $(gb_MSBUILD_CONFIG_AND_PLATFORM) \ /p:opensslIncludeDir=$(call gb_UnpackedTarball_get_dir,openssl)/include \ /p:opensslOutDir=$(call gb_UnpackedTarball_get_dir,openssl) \ /p:zlibDir=$(call gb_UnpackedTarball_get_dir,zlib) \ |