Kaydet (Commit) e04c734f authored tarafından David Ostrovsky's avatar David Ostrovsky

MSVC 14.0: Second attempt to fix Python in 32bit build mode

Change-Id: I709fda2e6df5048bdbf9157518d6b7b98ff45515
Reviewed-on: https://gerrit.libreoffice.org/22730Reviewed-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
Tested-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
üst a620a82a
...@@ -3046,7 +3046,7 @@ endif ...@@ -3046,7 +3046,7 @@ endif
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)$(if $(filter 140-INTEL,$(VCVER)-$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
) )
else ifeq ($(OS),MACOSX) else ifeq ($(OS),MACOSX)
$(call gb_LinkTarget_add_libs,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment