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

lcms2: Don't hard code Win32 platform on Windows

Change-Id: I60701b2c0a0ec06ada24b397107b337676dbd319
Reviewed-on: https://gerrit.libreoffice.org/13229Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 34555600
...@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): ...@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
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=Win32 /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)) ,$(if $(filter 120,$(VCVER)),Projects/VC2013/lcms2_DLL,Projects/VC2010/lcms2_DLL))
else else
......
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