OSDN > Find Software > Yet Another Mado tsukai no Yuutsu > SCM > git > yamy > Commit

Yet Another Mado tsukai no Yuutsu
Fork

R/O
HTTP
SSH
HTTPS

yamy: Commit

source code repository of yamy

Commit MetaInfo

Revision	ee50853039a8b4e9342d809ec55e36d42ec838f0 (tree)
Time	2014-10-01 18:45:03
Author	gimy <gimy@user...>
Commiter	gimy

Log Message

use boost_1_56_0 and build by VS2013

Change Summary

modified: .gitignore (diff)
modified: compiler_specific.h (diff)
modified: proj/regex32.vcxproj (diff)
modified: proj/regex64.vcxproj (diff)
modified: proj/yamy.props (diff)
modified: proj/yamydll.props (diff)
modified: tools/makedistrib.js (diff)
modified: tools/makeregex_template.bat (diff)

Incremental Difference

--- a/.gitignore

+++ b/.gitignore

		@@ -1,6 +1,7 @@
1	1	*~
2	2	*.pdb
3	3	*.sdf
	4	+*.opensdf
4	5	functions.h
5	6	/Debug
6	7	/Release

--- a/compiler_specific.h

+++ b/compiler_specific.h

		@@ -21,7 +21,7 @@
21	21	# pragma warning(disable : 4061 4100 4132 4552 4701 4706 4786)
22	22
23	23	# define setmode _setmode
24		-# define for if (false) ; else for
	24	+//# define for if (false) ; else for
25	25
26	26	# define stati64_t _stati64
27	27

--- a/proj/regex32.vcxproj

+++ b/proj/regex32.vcxproj

		@@ -62,7 +62,7 @@
62	62	<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
63	63	</ClCompile>
64	64	<Lib>
65		- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
	65	+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
66	66	</Lib>
67	67	</ItemDefinitionGroup>
68	68	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">

		@@ -83,7 +83,7 @@
83	83	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
84	84	</ClCompile>
85	85	<Lib>
86		- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib</OutputFile>
	86	+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib</OutputFile>
87	87	</Lib>
88	88	</ItemDefinitionGroup>
89	89	<ItemGroup>

--- a/proj/regex64.vcxproj

+++ b/proj/regex64.vcxproj

		@@ -87,7 +87,7 @@
87	87	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
88	88	</ClCompile>
89	89	<Lib>
90		- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
	90	+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-sgd-$(BOOST_MAJOR).lib</OutputFile>
91	91	</Lib>
92	92	</ItemDefinitionGroup>
93	93	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">

		@@ -111,7 +111,7 @@
111	111	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
112	112	</ClCompile>
113	113	<Lib>
114		- <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\libboost_regex-mt-s-$(BOOST_MAJOR).lib</OutputFile>
	114	+ <OutputFile>ext_lib$(CPUBIT)\$(Configuration)\lib\libboost_regex-vc120-mt-s-$(BOOST_MAJOR).lib</OutputFile>
115	115	</Lib>
116	116	</ItemDefinitionGroup>
117	117	<ItemGroup>

		@@ -124,12 +124,6 @@
124	124	<Outputs Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">%(RootDir)%(Directory)makeregex.bat;%(Outputs)</Outputs>
125	125	</CustomBuild>
126	126	</ItemGroup>
127		- <ItemGroup>
128		- <ProjectReference Include="regex32.vcxproj">
129		- <Project>{2376fa78-c8b7-4ed0-b4e3-b5ad778a8c0f}</Project>
130		- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
131		- </ProjectReference>
132		- </ItemGroup>
133	127	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
134	128	<ImportGroup Label="ExtensionTargets">
135	129	</ImportGroup>

--- a/proj/yamy.props

+++ b/proj/yamy.props

		@@ -4,7 +4,7 @@
4	4	</ImportGroup>
5	5	<PropertyGroup Label="UserMacros">
6	6	<VERSION>0.03</VERSION>
7		- <BOOST_MAJOR>1_38</BOOST_MAJOR>
	7	+ <BOOST_MAJOR>1_56</BOOST_MAJOR>
8	8	<BOOST_MINOR>0</BOOST_MINOR>
9	9	</PropertyGroup>
10	10	<PropertyGroup>

		@@ -12,7 +12,15 @@
12	12	<OutDir>..\$(Configuration)\</OutDir>
13	13	<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
14	14	</PropertyGroup>
15		- <ItemDefinitionGroup />
	15	+ <ItemDefinitionGroup>
	16	+ <ClCompile>
	17	+ <AdditionalIncludeDirectories>../../boost_$(BOOST_MAJOR)_$(BOOST_MINOR)</AdditionalIncludeDirectories>
	18	+ <PreprocessorDefinitions>VERSION="$(VERSION)";LOGNAME="$(USERNAME)";COMPUTERNAME="$(COMPUTERNAME)";_CRT_SECURE_NO_WARNINGS;MAYU64;USE_INI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
	19	+ </ClCompile>
	20	+ <Link>
	21	+ <AdditionalLibraryDirectories>ext_lib$(CPUBIT)\$(ConfigurationName)\lib</AdditionalLibraryDirectories>
	22	+ </Link>
	23	+ </ItemDefinitionGroup>
16	24	<ItemGroup>
17	25	<BuildMacro Include="VERSION">
18	26	<Value>$(VERSION)</Value>

--- a/proj/yamydll.props

+++ b/proj/yamydll.props

		@@ -10,6 +10,8 @@
10	10	<Link>
11	11	<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
12	12	<OutputFile>$(OutDir)yamy$(CPUBIT).dll</OutputFile>
	13	+ <AdditionalLibraryDirectories>
	14	+ </AdditionalLibraryDirectories>
13	15	</Link>
14	16	</ItemDefinitionGroup>
15	17	<ItemGroup />

--- a/tools/makedistrib.js

+++ b/tools/makedistrib.js

		@@ -28,7 +28,7 @@ if (fso == null) {
28	28	}
29	29
30	30	var shell = WScript.CreateObject("Shell.Application");
31		-if (fso == null) {
	31	+if (shell == null) {
32	32	throw new Error("can't create Shell Application Object!");
33	33	}
34	34

		@@ -50,7 +50,7 @@ var PackFile = function(dir, name) {
50	50	RemoveFile(targetDir, pkgFile);
51	51	throw new Error("can't pack " + path + "!");
52	52	}
53		- var item = shell.NameSpace(fso.GetAbsolutePathName(path) + "\\..\\").ParseName(name);
	53	+ var item = shell.NameSpace(fso.GetAbsolutePathName(dir)).ParseName(name);
54	54	var count = targetZip.Items().Count;
55	55	targetZip.CopyHere(item);
56	56	while (targetZip.Items().Count != count + 1) {

--- a/tools/makeregex_template.bat

+++ b/tools/makeregex_template.bat

		@@ -2,6 +2,8 @@
2	2	#define VC_VERSION vc9
3	3	#elif _MSC_VER == 1400
4	4	#define VC_VERSION vc8
	5	+#elif _MSC_VER == 1800
	6	+#define VC_VERSION vc12
5	7	#endif
6	8
7	9	set CONFIG=%1

		@@ -10,19 +12,25 @@ set BOOST_MINOR=%3
10	12	set CPUBIT=%4
11	13	set BOOST_DIR=..\..\boost_%BOOST_MAJOR%_%BOOST_MINOR%
12	14	set REGEX_VC=VC_VERSION
	15	+set STAGE_DIR=%~dp0\..\proj\ext_lib%CPUBIT%\%CONFIG%
13	16
14		-if "%CONFIG%" == "Debug" set GD=gd
	17	+if "%CONFIG%" == "Debug" (
	18	+ set GD=gd
	19	+ set VARIANT=debug
	20	+) else (
	21	+ set GD=
	22	+ set VARIANT=release
	23	+)
15	24
16	25	set REGEX=libboost_regex-%REGEX_VC%0-mt-s%GD%-%BOOST_MAJOR%
17	26
18		-pushd %BOOST_DIR%\libs\regex\build
	27	+pushd %BOOST_DIR%
19	28
20		-if exist %REGEX_VC%0\%REGEX%.lib nmake -f %REGEX_VC%.mak %REGEX%_clean
21		-nmake -f %REGEX_VC%.mak XCFLAGS=-D_WCTYPE_INLINE_DEFINED main_dir %REGEX%_dir ./%REGEX_VC%0/%REGEX%.lib
	29	+b2 --build-dir=build/boost%CPUBIT% --stagedir=%STAGE_DIR% --with-regex address-model=%CPUBIT% variant=%VARIANT% link=static threading=multi runtime-link=static stage
22	30
23	31	popd
24	32
25		-copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib
26		-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
	33	+rem copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.lib ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.lib
	34	+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
27	35
28		-if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.pdb
	36	+rem if "%CONFIG%" == "Debug" copy /Y %BOOST_DIR%\libs\regex\build\%REGEX_VC%0\%REGEX%.pdb ..\proj\ext_lib%CPUBIT%\%CONFIG%\%REGEX%.pdb

Show on old repository browser