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 /cppunit/ExternalPackage_cppunit.mk | |
parent | gbuild: add support for building against MSVC debug runtime (diff) | |
download | core-4811c2dc9f94929b60e7e2e0077871aad14fdc3a.tar.gz core-4811c2dc9f94929b60e7e2e0077871aad14fdc3a.zip |
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 'cppunit/ExternalPackage_cppunit.mk')
-rw-r--r-- | cppunit/ExternalPackage_cppunit.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk index 6ebe24343ea3..d900e22a1fd2 100644 --- a/cppunit/ExternalPackage_cppunit.mk +++ b/cppunit/ExternalPackage_cppunit.mk @@ -12,9 +12,9 @@ $(eval $(call gb_ExternalPackage_use_external_project,cppunit,cppunit)) ifeq ($(OS),WNT) ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/cppunit_dll.dll,src/cppunit/ReleaseDll/cppunit_dll.dll)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/ReleaseDll/cppunit_dll.lib)) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester_dll.exe)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/$(if $(MSVC_USE_DEBUG_RUNTIME),cppunitd_dll.dll,cppunit_dll.dll),src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.dll,ReleaseDll/cppunit_dll.dll))) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/cppunitd_dll.lib,ReleaseDll/cppunit_dll.lib))) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll/DllPlugInTesterd_dll.exe,ReleaseDll/DllPlugInTester_dll.exe))) else $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll)) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dll.a,src/cppunit/.libs/libcppunit.dll.a)) |