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 /lcms2 | |
| 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 'lcms2')
| -rw-r--r-- | lcms2/ExternalPackage_lcms2.mk | 6 | ||||
| -rw-r--r-- | lcms2/ExternalProject_lcms2.mk | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index 7c2a75a857f9..c2d5c5a7443b 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -20,8 +20,10 @@ ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a)) $(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll)) else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib)) -$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib)) +# note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is +# actually called LCMS2D.DLL then +$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) endif else $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so)) diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index d76049e13462..dc77783cfb1b 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -20,13 +20,16 @@ ifeq ($(COM),MSC) ifeq ($(filter-out 14 13,$(COMEX)),) $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ - MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \ + MSBuild.exe lcms2_DLL.vcxproj \ + /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + /p:Platform=Win32 /p:TargetName=lcms2 \ $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \ ,Projects/VC2010/lcms2_DLL) else $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ - $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" \ + $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj \ + "$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)|Win32" \ ,Projects/VC2008/lcms2_DLL) endif else |