summaryrefslogtreecommitdiff
path: root/lcms2
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-08-22 17:05:20 -0400
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-10-07 01:57:38 +0000
commitbac631c43d53e0f1eb679a853d1fbbb9954d6e3a (patch)
tree2e7e528dd8793e9c2e11cd3cf168c832a2625fed /lcms2
parente15b459156d488a52c8e70e79e65ae335703a54c (diff)
fix lcms2 build with VC2012
Change-Id: I665da7fbb3fb9f991d952658b247c9a80e8abede Reviewed-on: https://gerrit.libreoffice.org/786 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'lcms2')
-rw-r--r--lcms2/makefile.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index a87ac10e5f89..86f3620f790a 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