From 1e3cb590585c9e88e1020fb2fc681df50cc58687 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Thu, 29 Dec 2016 23:42:33 +0300 Subject: [PATCH] FS-9897 [mod_v8] Fix Visual Studio 2015 build --- libs/win32/Download V8.2015.vcxproj | 4 ++-- libs/win32/v8/build-v8.bat | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/win32/Download V8.2015.vcxproj b/libs/win32/Download V8.2015.vcxproj index 64ede7f2f7..55f960d751 100644 --- a/libs/win32/Download V8.2015.vcxproj +++ b/libs/win32/Download V8.2015.vcxproj @@ -67,12 +67,12 @@ Document Downloading V8. - if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2 "$(ProjectDir).." + if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-vs2015.tar.bz2 "$(ProjectDir).." if not exist "$(ProjectDir)..\v8-$(V8Version)\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2 "$(ProjectDir).." $(ProjectDir)..\v8-$(V8Version);%(Outputs) Downloading V8. - if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2 "$(ProjectDir).." + if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-vs2015.tar.bz2 "$(ProjectDir).." if not exist "$(ProjectDir)..\v8-$(V8Version)\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2 "$(ProjectDir).." $(ProjectDir)..\v8-$(V8Version);%(Outputs) diff --git a/libs/win32/v8/build-v8.bat b/libs/win32/v8/build-v8.bat index 21b1af7db6..6f0077b2d2 100644 --- a/libs/win32/v8/build-v8.bat +++ b/libs/win32/v8/build-v8.bat @@ -29,6 +29,9 @@ IF "%VisualStudioVersion%" == "11.0" ( ) ELSE IF "%VisualStudioVersion%" == "12.0" ( SET VS_VERSION=-Gmsvs_version=2013 ECHO Forcing build to use Visual Studio 2013 +) ELSE IF "%VisualStudioVersion%" == "14.0" ( + SET VS_VERSION=-Gmsvs_version=2015 + ECHO Forcing build to use Visual Studio 2015 ) ELSE IF NOT "%4" == "" ( SET VS_VERSION=-Gmsvs_version=%4 ECHO Forcing build to use Visual Studio %4