From ee50853039a8b4e9342d809ec55e36d42ec838f0 Mon Sep 17 00:00:00 2001 From: gimy Date: Wed, 1 Oct 2014 18:45:03 +0900 Subject: [PATCH] use boost_1_56_0 and build by VS2013 --- .gitignore | 1 + compiler_specific.h | 2 +- proj/regex32.vcxproj | 4 ++-- proj/regex64.vcxproj | 10 ++-------- proj/yamy.props | 12 ++++++++++-- proj/yamydll.props | 2 ++ tools/makedistrib.js | 4 ++-- tools/makeregex_template.bat | 22 +++++++++++++++------- 8 files changed, 35 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index ff623e8..001c774 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *.pdb *.sdf +*.opensdf functions.h /Debug /Release diff --git a/compiler_specific.h b/compiler_specific.h index 1490e6e..8aef0ed 100644 --- a/compiler_specific.h +++ b/compiler_specific.h @@ -21,7 +21,7 @@ # pragma warning(disable : 4061 4100 4132 4552 4701 4706 4786) # define setmode _setmode -# define for if (false) ; else for +//# define for if (false) ; else for # define stati64_t _stati64 diff --git a/proj/regex32.vcxproj b/proj/regex32.vcxproj index 2141fdc..0881451 100644 --- a/proj/regex32.vcxproj +++ b/proj/regex32.vcxproj @@ -62,7 +62,7 @@ EditAndContinue - ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib + ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib @@ -83,7 +83,7 @@ ProgramDatabase - ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib + ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib diff --git a/proj/regex64.vcxproj b/proj/regex64.vcxproj index d574210..403e2bc 100644 --- a/proj/regex64.vcxproj +++ b/proj/regex64.vcxproj @@ -87,7 +87,7 @@ ProgramDatabase - ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib + ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib @@ -111,7 +111,7 @@ ProgramDatabase - ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib + ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib @@ -124,12 +124,6 @@ %(RootDir)%(Directory)makeregex.bat;%(Outputs) - - - {2376fa78-c8b7-4ed0-b4e3-b5ad778a8c0f} - false - - diff --git a/proj/yamy.props b/proj/yamy.props index f038e13..85de05b 100644 --- a/proj/yamy.props +++ b/proj/yamy.props @@ -4,7 +4,7 @@ 0.03 - 1_38 + 1_56 0 @@ -12,7 +12,15 @@ ..\$(Configuration)\ $(Configuration)\$(ProjectName)\ - + + + ../../boost_$(BOOST_MAJOR)_$(BOOST_MINOR) + VERSION="$(VERSION)";LOGNAME="$(USERNAME)";COMPUTERNAME="$(COMPUTERNAME)";_CRT_SECURE_NO_WARNINGS;MAYU64;USE_INI;%(PreprocessorDefinitions) + + + ext_lib$(CPUBIT)\$(ConfigurationName)\lib + + $(VERSION) diff --git a/proj/yamydll.props b/proj/yamydll.props index fdd3712..ca19461 100644 --- a/proj/yamydll.props +++ b/proj/yamydll.props @@ -10,6 +10,8 @@ imm32.lib;%(AdditionalDependencies) $(OutDir)yamy$(CPUBIT).dll + + diff --git a/tools/makedistrib.js b/tools/makedistrib.js index 4c98d16..caf0482 100644 --- a/tools/makedistrib.js +++ b/tools/makedistrib.js @@ -28,7 +28,7 @@ if (fso == null) { } var shell = WScript.CreateObject("Shell.Application"); -if (fso == null) { +if (shell == null) { throw new Error("can't create Shell Application Object!"); } @@ -50,7 +50,7 @@ var PackFile = function(dir, name) { RemoveFile(targetDir, pkgFile); throw new Error("can't pack " + path + "!"); } - var item = shell.NameSpace(fso.GetAbsolutePathName(path) + "\\..\\").ParseName(name); + var item = shell.NameSpace(fso.GetAbsolutePathName(dir)).ParseName(name); var count = targetZip.Items().Count; targetZip.CopyHere(item); while (targetZip.Items().Count != count + 1) { diff --git a/tools/makeregex_template.bat b/tools/makeregex_template.bat index bddb471..c371dfc 100644 --- a/tools/makeregex_template.bat +++ b/tools/makeregex_template.bat @@ -2,6 +2,8 @@ #define VC_VERSION vc9 #elif _MSC_VER == 1400 #define VC_VERSION vc8 +#elif _MSC_VER == 1800 +#define VC_VERSION vc12 #endif set CONFIG=%1 @@ -10,19 +12,25 @@ set BOOST_MINOR=%3 set CPUBIT=%4 set BOOST_DIR=..\..\boost_%BOOST_MAJOR%_%BOOST_MINOR% set REGEX_VC=VC_VERSION +set STAGE_DIR=%~dp0\..\proj\ext_lib%CPUBIT%\%CONFIG% -if "%CONFIG%" == "Debug" set GD=gd +if "%CONFIG%" == "Debug" ( + set GD=gd + set VARIANT=debug +) else ( + set GD= + set VARIANT=release +) set REGEX=libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR% -pushd %BOOST_DIR%\libs\regex\build +pushd %BOOST_DIR% -if exist %REGEX_VC%0\%REGEX%.lib nmake -f %REGEX_VC%.mak %REGEX%_clean -nmake -f %REGEX_VC%.mak XCFLAGS=-D_WCTYPE_INLINE_DEFINED main_dir %REGEX%_dir ./%REGEX_VC%0/%REGEX%.lib +b2 --build-dir=build/boost%CPUBIT% --stagedir=%STAGE_DIR% --with-regex address-model=%CPUBIT% variant=%VARIANT% link=static threading=multi runtime-link=static stage popd -copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib -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 +rem copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib +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 -if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.pdb +rem if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.pdb -- 2.11.0