[Libreoffice-commits] .: lcms2/makefile.mk

[Libreoffice Gerrit user]

 lcms2/makefile.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit bac631c43d53e0f1eb679a853d1fbbb9954d6e3a
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Aug 22 17:05:20 2012 -0400

    fix lcms2 build with VC2012
    
    Change-Id: I665da7fbb3fb9f991d952658b247c9a80e8abede
    Reviewed-on: https://gerrit.libreoffice.org/786
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index a87ac10..86f3620 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -54,7 +54,10 @@ CONFIGURE_DIR=.
 
 CONFIGURE_ACTION =
 
-.IF "$(CCNUMVER)" >= "001600000000"
+.IF "$(CCNUMVER)" >= "001700000000"
+BUILD_DIR=Projects/VC2010/lcms2_DLL
+BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 /p:PlatformToolset=v110
+.ELIF "$(CCNUMVER)" >= "001600000000"
 BUILD_DIR=Projects/VC2010/lcms2_DLL
 BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2
 .ELSE