diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-04-16 12:44:15 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-04-16 12:46:56 +0300 |
| commit | 06575c858de25850c54aaeb9d671bebccb73cdaf (patch) | |
| tree | 517ff7c4a928947c708a32d3687441779e2e36e1 /lcms2 | |
| parent | 0039c8598cfdd3fd31f83d3c1f336f858773d25f (diff) | |
Fix dbgutil build of lcms2 with MSVC2012 (and 2010?)
The produced .lib is called lcms2.lib (no "d") in that case.
Change-Id: If581bd722e52062343f8b2407c05d551be706047
Diffstat (limited to 'lcms2')
| -rw-r--r-- | lcms2/ExternalPackage_lcms2.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index c2d5c5a7443b..08a5b7b3b999 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -20,7 +20,7 @@ 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$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),$(if $(filter-out 13 14,$(COMEX)),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)) |