[Libreoffice-commits] core.git: lcms2/ExternalPackage_lcms2.mk

[Tor Lillqvist]

 lcms2/ExternalPackage_lcms2.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06575c858de25850c54aaeb9d671bebccb73cdaf
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Apr 16 12:44:15 2013 +0300

    Fix dbgutil build of lcms2 with MSVC2012 (and 2010?)
    
    The produced .lib is called lcms2.lib (no "d") in that case.
    
    Change-Id: If581bd722e52062343f8b2407c05d551be706047

diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index c2d5c5a..08a5b7b 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))