Kaydet (Commit) 3e31d11f authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Michael Stahl

Lcms2: Fix compilation on VS 2015

Change-Id: I303494f692520cdd34b88f9d5daf8a92a6b72ca2
Reviewed-on: https://gerrit.libreoffice.org/16803Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 90334404
...@@ -17,11 +17,12 @@ ifeq ($(COM),MSC) ...@@ -17,11 +17,12 @@ ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade lcms2_DLL.vcxproj,echo up-to-date) && \
MSBuild.exe lcms2_DLL.vcxproj \ MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \ /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 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 else
$(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment