diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-11-30 18:29:22 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-02 14:35:12 +0000 |
| commit | 74b2cdd48992c3627586887d67638fc87125ca94 (patch) | |
| tree | 16c0356afeaab81253e46efc97e7e647abf5f470 /external | |
| parent | 34555600b019a85f0aec0a9d18e7833bc934788b (diff) | |
lcms2: Don't hard code Win32 platform on Windows
Change-Id: I60701b2c0a0ec06ada24b397107b337676dbd319
Reviewed-on: https://gerrit.libreoffice.org/13229
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/lcms2/ExternalProject_lcms2.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 56982ee11bf5..dd9822272930 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -19,7 +19,7 @@ $(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 \ + /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)) else |