*~
*.pdb
*.sdf
+*.opensdf
functions.h
/Debug
/Release
# 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
<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
<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
<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
<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
<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
</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
<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
<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
}\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
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
#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
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