external/coinmp/ExternalProject_coinmp.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit c214802883054df349650835f86f9ea9468b778a
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Fri Jul 24 21:25:30 2015 +0200
Fix coinmp on MSVC 14.0
Change-Id: I59372b51ce4aef2e4a923787db61e20cfd96a9fa
Reviewed-on: https://gerrit.libreoffice.org/17342
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
old mode 100644
new mode 100755
index d8bfaac..7b6cd07
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
+ $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
,CoinMP/MSVisualStudio/v9)
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
