diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-14 13:52:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-15 15:26:32 +0200 |
| commit | 4811c2dc9f94929b60e7e2e0077871aad14fdc3a (patch) | |
| tree | 8754348c8dbdf9c4fb91e0d70346f96ee7455999 /scp2/InstallModule_python.mk | |
| parent | 3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (diff) | |
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3
lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.
openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.
Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
Diffstat (limited to 'scp2/InstallModule_python.mk')
| -rw-r--r-- | scp2/InstallModule_python.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 8b8af4809bda..9839ef6bd75f 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -49,7 +49,8 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DPYVERSION=$(PYTHON_VERSION) \ -DPYMAJMIN=$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ -DPYMAJOR=$(PYTHON_VERSION_MAJOR) \ - -DPY_FULL_DLL_NAME=$(if $(filter WNT-MSC,$(OS)-$(COM)),python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so) \ + -DPY_FULL_DLL_NAME=$(if $(filter WNT-MSC,$(OS)-$(COM)),python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so) \ + $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \ )) endif |