use boost_1_56_0 and build by VS2013

diff --git a/.gitignore b/.gitignore
index ff623e8..001c774 100644 (file)
--- 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 (file)
--- a/compiler_specific.h
+++ b/compiler_specific.h
@@ -21,7 +21,7 @@
 #    pragma warning(disable : 4061 4100 4132 4552 4701 4706 4786)\r
 \r
 #    define setmode _setmode\r
-#    define for if (false) ; else for\r
+//#    define for if (false) ; else for\r
 \r
 #    define stati64_t _stati64\r
 \r

diff --git a/proj/regex32.vcxproj b/proj/regex32.vcxproj
index 2141fdc..0881451 100644 (file)
--- a/proj/regex32.vcxproj
+++ b/proj/regex32.vcxproj
@@ -62,7 +62,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
     </ClCompile>\r
     <Lib>\r
-      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>\r
+      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>\r
     </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -83,7 +83,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Lib>\r
-      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib</OutputFile>\r
+      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib</OutputFile>\r
     </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r

diff --git a/proj/regex64.vcxproj b/proj/regex64.vcxproj
index d574210..403e2bc 100644 (file)
--- a/proj/regex64.vcxproj
+++ b/proj/regex64.vcxproj
@@ -87,7 +87,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Lib>\r
-      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>\r
+      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>\r
     </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
@@ -111,7 +111,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Lib>\r
-      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib</OutputFile>\r
+      <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib</OutputFile>\r
     </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
@@ -124,12 +124,6 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)makeregex.bat;%(Outputs)</Outputs>\r
     </CustomBuild>\r
   </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="regex32.vcxproj">\r
-      <Project>{2376fa78-c8b7-4ed0-b4e3-b5ad778a8c0f}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/proj/yamy.props b/proj/yamy.props
index f038e13..85de05b 100644 (file)
--- a/proj/yamy.props
+++ b/proj/yamy.props
@@ -4,7 +4,7 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
     <VERSION>0.03</VERSION>\r
-    <BOOST_MAJOR>1_38</BOOST_MAJOR>\r
+    <BOOST_MAJOR>1_56</BOOST_MAJOR>\r
     <BOOST_MINOR>0</BOOST_MINOR>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
@@ -12,7 +12,15 @@
     <OutDir>..\$(Configuration)\</OutDir>\r
     <IntDir>$(Configuration)\$(ProjectName)\</IntDir>\r
   </PropertyGroup>\r
-  <ItemDefinitionGroup />\r
+  <ItemDefinitionGroup>\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>../../boost_$(BOOST_MAJOR)_$(BOOST_MINOR)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>VERSION="$(VERSION)";LOGNAME="$(USERNAME)";COMPUTERNAME="$(COMPUTERNAME)";_CRT_SECURE_NO_WARNINGS;MAYU64;USE_INI;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalLibraryDirectories>ext_lib$(CPUBIT)\$(ConfigurationName)\lib</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <BuildMacro Include="VERSION">\r
       <Value>$(VERSION)</Value>\r

diff --git a/proj/yamydll.props b/proj/yamydll.props
index fdd3712..ca19461 100644 (file)
--- a/proj/yamydll.props
+++ b/proj/yamydll.props
@@ -10,6 +10,8 @@
     <Link>\r
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)yamy$(CPUBIT).dll</OutputFile>\r
+      <AdditionalLibraryDirectories>\r
+      </AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup />\r

diff --git a/tools/makedistrib.js b/tools/makedistrib.js
index 4c98d16..caf0482 100644 (file)
--- a/tools/makedistrib.js
+++ b/tools/makedistrib.js
@@ -28,7 +28,7 @@ if (fso == null) {
 }\r
 \r
 var shell = WScript.CreateObject("Shell.Application");\r
-if (fso == null) {\r
+if (shell == null) {\r
        throw new Error("can't create Shell Application Object!");\r
 }\r
 \r
@@ -50,7 +50,7 @@ var PackFile = function(dir, name) {
        RemoveFile(targetDir, pkgFile);\r
        throw new Error("can't pack " + path + "!");\r
     }\r
-    var item = shell.NameSpace(fso.GetAbsolutePathName(path) + "\\..\\").ParseName(name);\r
+    var item = shell.NameSpace(fso.GetAbsolutePathName(dir)).ParseName(name);\r
     var count = targetZip.Items().Count;\r
     targetZip.CopyHere(item);\r
     while (targetZip.Items().Count != count + 1) {\r

diff --git a/tools/makeregex_template.bat b/tools/makeregex_template.bat
index bddb471..c371dfc 100644 (file)
--- 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,19 +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
 set REGEX=libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%\r
 \r
-pushd %BOOST_DIR%\libs\regex\build\r
+pushd %BOOST_DIR%\r
 \r
-if exist %REGEX_VC%0\%REGEX%.lib nmake -f %REGEX_VC%.mak %REGEX%_clean\r
-nmake -f %REGEX_VC%.mak XCFLAGS=-D_WCTYPE_INLINE_DEFINED main_dir %REGEX%_dir ./%REGEX_VC%0/%REGEX%.lib\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\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib\r
-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
+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\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.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