use boost_1_56_0 and build by VS2013

[yamy/yamy.git] / tools / makeregex_template.bat

diff --git a/tools/makeregex_template.bat b/tools/makeregex_template.bat
old mode 100755 (executable)
new mode 100644 (file)
index 91a8d2f..c371dfc
--- a/tools/makeregex_template.bat
+++ b/tools/makeregex_template.bat
@@ -2,6 +2,8 @@
 #define VC_VERSION vc9\r
 #elif _MSC_VER == 1400\r
 #define VC_VERSION vc8\r
+#elif _MSC_VER == 1800\r
+#define VC_VERSION vc12\r
 #endif\r
 \r
 set CONFIG=%1\r
@@ -10,17 +12,25 @@ set BOOST_MINOR=%3
 set CPUBIT=%4\r
 set BOOST_DIR=..\..\boost_%BOOST_MAJOR%_%BOOST_MINOR%\r
 set REGEX_VC=VC_VERSION\r
+set STAGE_DIR=%~dp0\..\proj\ext_lib%CPUBIT%\%CONFIG%\r
 \r
-if "%CONFIG%" == "Debug" set GD=gd\r
+if "%CONFIG%" == "Debug" (\r
+       set GD=gd\r
+       set VARIANT=debug\r
+) else (\r
+       set GD=\r
+       set VARIANT=release\r
+)\r
 \r
-pushd %BOOST_DIR%\libs\regex\build\r
+set REGEX=libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%\r
 \r
-nmake -f %REGEX_VC%.mak libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%_clean\r
-nmake -f %REGEX_VC%.mak XCFLAGS=-D_WCTYPE_INLINE_DEFINED main_dir libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%_dir ./%REGEX_VC%0/libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%.lib\r
+pushd %BOOST_DIR%\r
+\r
+b2 --build-dir=build/boost%CPUBIT% --stagedir=%STAGE_DIR% --with-regex address-model=%CPUBIT% variant=%VARIANT% link=static threading=multi runtime-link=static stage\r
 \r
 popd\r
 \r
-copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%.lib\r
-copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\libboost_regex-mt-s%GD%-%BOOST_MAJOR%.lib\r
+rem copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib\r
+rem copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\libboost_regex-mt-s%GD%-%BOOST_MAJOR%.lib\r
 \r
-if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%.pdb\r
+rem if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.pdb\r