From 8120e95e2b8f685f5c951cd316ac443a14dba79a Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 31 May 2013 14:32:03 +0300
Subject: Bin more VS2008 bits

Change-Id: Ia52fdae1e386ea92f11185ce7cdac65baed10495
---
 lcms2/ExternalPackage_lcms2.mk |  2 +-
 lcms2/ExternalProject_lcms2.mk | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'lcms2')

diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index b5cd18098f60..30bf08950a5a 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_library_for_install,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),$(if $(filter-out 13 14,$(COMEX)),d)).lib))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2.lib))
 # note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is
 # actually called LCMS2D.DLL then
 $(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index 1689482441be..e128b24f5ea4 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -15,22 +15,14 @@ $(eval $(call gb_ExternalProject_register_targets,lcms2,\
 
 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=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 			/p:Platform=Win32 /p:TargetName=lcms2 \
-			$(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
+			$(if $(filter 110,$(VCVER)),/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 \
-			"$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)|Win32" \
-	,Projects/VC2008/lcms2_DLL)
-endif
-else
 $(call gb_ExternalProject_get_state_target,lcms2,build):
 	$(call gb_ExternalProject_run,build,\
 		./configure --without-jpeg --without-tiff --with-pic \
-- 
cgit