[Libreoffice-commits] core.git: RepositoryExternal.mk
David Ostrovsky
david at ostrovsky.org
Sat Feb 27 21:22:02 UTC 2016
RepositoryExternal.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e04c734f56d7e4a16a2dd1b64a51cecbdf6796cf
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sat Feb 27 14:14:12 2016 +0100
MSVC 14.0: Second attempt to fix Python in 32bit build mode
Change-Id: I709fda2e6df5048bdbf9157518d6b7b98ff45515
Reviewed-on: https://gerrit.libreoffice.org/22730
Reviewed-by: David Ostrovsky <david at ostrovsky.org>
Tested-by: David Ostrovsky <david at ostrovsky.org>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39b740b..8e91812 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3046,7 +3046,7 @@ endif
ifeq ($(OS),WNT)
$(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)
$(call gb_LinkTarget_add_libs,$(1),\
More information about the Libreoffice-commits
mailing list