From 545f4f943f3e8a28a8766b6dbcdc5bc702a750ea Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 9 Mar 2014 19:44:04 +0000 Subject: [PATCH] [UPDATE] (AUTHOR Chris Covier) Make Scintilla project compilable under VS2013. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1199 f5eea248-9336-0410-98b8-ebc06183d4e3 --- scintilla/boostregex/BuildBoost.bat | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/scintilla/boostregex/BuildBoost.bat b/scintilla/boostregex/BuildBoost.bat index 28dbf23d..75d62afa 100644 --- a/scintilla/boostregex/BuildBoost.bat +++ b/scintilla/boostregex/BuildBoost.bat @@ -117,6 +117,16 @@ IF NOT [%MSVCTOOLSET%]==[] ( GOTO TOOLSETKNOWN ) +:: VS2013 +IF EXIST %BOOSTPATH%\bin.v2\libs\regex\build\msvc-12.0\release\link-static\runtime-link-static\threading-multi\libboost_regex-vc120-mt-s-%BOOSTVERSION%.lib ( + SET MSVCTOOLSET=msvc-12.0 +) + +:: VS2012 +IF EXIST %BOOSTPATH%\bin.v2\libs\regex\build\msvc-11.0\release\link-static\runtime-link-static\threading-multi\libboost_regex-vc110-mt-s-%BOOSTVERSION%.lib ( + SET MSVCTOOLSET=msvc-11.0 +) + :: VS2010 IF EXIST %BOOSTPATH%\bin.v2\libs\regex\build\msvc-10.0\release\link-static\runtime-link-static\threading-multi\libboost_regex-vc100-mt-s-%BOOSTVERSION%.lib ( SET MSVCTOOLSET=msvc-10.0 @@ -145,7 +155,16 @@ ECHO Run buildboost.bat without parameters to see the usage. :TOOLSETKNOWN - + +:: VS2013 +IF [%MSVCTOOLSET%]==[msvc-12.0] ( + SET BOOSTLIBPATH=%BOOSTPATH%\bin.v2\libs\regex\build\msvc-12.0 +) + +:: VS2012 +IF [%MSVCTOOLSET%]==[msvc-11.0] ( + SET BOOSTLIBPATH=%BOOSTPATH%\bin.v2\libs\regex\build\msvc-11.0 +) :: VS2010 IF [%MSVCTOOLSET%]==[msvc-10.0] (