[Libreoffice-commits] core.git: external/lcms2

Matúš Kukan matus.kukan at collabora.com
Tue May 13 02:37:48 PDT 2014


 external/lcms2/ExternalPackage_lcms2.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b3ddc791546784bab602f678d07ac3538b034b4d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue May 13 11:36:37 2014 +0200

    no lcms2d.dll nowadays, there is only lcms2.dll
    
    Change-Id: I0d6537da5d605a011bd9b4491c472b0b58fcd668

diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk
index 59e5f62..06339c5 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -18,9 +18,7 @@ else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
 else ifeq ($(COM),MSC)
-# 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,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll))
 endif # $(COM)
 else  # $(OS) != WNT/MACOSX
 $(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.6))


More information about the Libreoffice-commits mailing list