diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-06 23:06:43 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-09 11:46:41 +0000 |
| commit | 3e31d11f9536f4c5d4e2b7d0782a978182182deb (patch) | |
| tree | 49ddfbed3300847d6adb5de25d695d9fe447bffa /external | |
| parent | 90334404e2bf9ced73f60793dc90056e1fd99938 (diff) | |
Lcms2: Fix compilation on VS 2015
Change-Id: I303494f692520cdd34b88f9d5daf8a92a6b72ca2
Reviewed-on: https://gerrit.libreoffice.org/16803
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/lcms2/ExternalProject_lcms2.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 441222a6c96c..e58ce61e8be5 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -17,11 +17,12 @@ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ + $(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade lcms2_DLL.vcxproj,echo up-to-date) && \ MSBuild.exe lcms2_DLL.vcxproj \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ - ,$(if $(filter 120,$(VCVER)),Projects/VC2013/lcms2_DLL,Projects/VC2010/lcms2_DLL)) + ,Projects/VC2013/lcms2_DLL) else $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ |