summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2014-07-08 21:44:12 +0200
committerMichael Stahl <mstahl@redhat.com>2014-07-11 11:47:02 +0000
commita21d0d7d5c3886b6ae9b5a2f7241d1a4a7846f08 (patch)
treef1ffb26f1de9162d1fa30ef57c5c4f6ac1fd177a
parent5a03dad45290a92941aab61ef03247c04b78154f (diff)
VS2013: Adjust lcms2 to 12.0 vcproj version
Change-Id: I5ec1ea40e57c7d9de337645421be89e1e4c5a867 Reviewed-on: https://gerrit.libreoffice.org/10157 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--external/lcms2/ExternalProject_lcms2.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index 1712c96bbc27..fa61bb7e347a 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -20,7 +20,8 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 /p:TargetName=lcms2 \
- $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120) \
,Projects/VC2010/lcms2_DLL)
else
$(call gb_ExternalProject_get_state_target,lcms2,build):