OSDN > 軟體搜索 > nethackexpress > SCM > git > trunk > 提交

nethackexpress
Fork

R/O
HTTP
SSH
HTTPS

trunk: 提交

メインリポジトリ

Commit MetaInfo

修訂	0a316301c2735e41fe50fdd26c638d33b35f206a (tree)
時間	2011-09-19 00:35:08
作者	unknown <shira@.(no...>
Commiter	unknown

Log Message

modify for VS2008

Change Summary

modified: build/NetHackW.vcproj (diff)
modified: build/makedefs.vcproj (diff)
modified: include/ntconf.h (diff)
modified: nethack.sln (diff)
modified: util/makedefs.c (diff)

差異

--- a/build/NetHackW.vcproj

+++ b/build/NetHackW.vcproj

		@@ -3,7 +3,8 @@
3	3	ProjectType="Visual C++"
4	4	Version="9.00"
5	5	Name="NetHackW"
6		- ProjectGUID="{0263CD61-31D2-493D-B9D7-B80113D51951}"
	6	+ ProjectGUID="{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}"
	7	+ RootNamespace="NetHackW"
7	8	TargetFrameworkVersion="0"
8	9	>
9	10	<Platforms>

		@@ -47,7 +48,7 @@
47	48	/>
48	49	<Tool
49	50	Name="VCCLCompilerTool"
50		- AdditionalOptions="/Gs /Oi- "
	51	+ AdditionalOptions="/wd 4996"
51	52	InlineFunctionExpansion="1"
52	53	FavorSizeOrSpeed="1"
53	54	OmitFramePointers="true"

		@@ -149,6 +150,7 @@
149	150	/>
150	151	<Tool
151	152	Name="VCCLCompilerTool"
	153	+ AdditionalOptions="/wd 4996"
152	154	Optimization="0"
153	155	AdditionalIncludeDirectories="..\win\win32,..\include,..\sys\winnt,..\sys\share,..\win\share"
154	156	PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS"

--- a/build/makedefs.vcproj

+++ b/build/makedefs.vcproj

		@@ -3,7 +3,8 @@
3	3	ProjectType="Visual C++"
4	4	Version="9.00"
5	5	Name="makedefs"
6		- ProjectGUID="{04709C3E-D077-4706-B991-D710C26FE86E}"
	6	+ ProjectGUID="{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}"
	7	+ RootNamespace="makedefs"
7	8	TargetFrameworkVersion="0"
8	9	>
9	10	<Platforms>

		@@ -43,6 +44,7 @@
43	44	/>
44	45	<Tool
45	46	Name="VCCLCompilerTool"
	47	+ AdditionalOptions="/wd 4996"
46	48	Optimization="2"
47	49	InlineFunctionExpansion="1"
48	50	AdditionalIncludeDirectories=".,..\include,..\sys\winnt"

		@@ -134,6 +136,7 @@
134	136	/>
135	137	<Tool
136	138	Name="VCCLCompilerTool"
	139	+ AdditionalOptions="/wd 4996"
137	140	Optimization="0"
138	141	AdditionalIncludeDirectories=".,..\include,..\sys\winnt"
139	142	PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS"

--- a/include/ntconf.h

+++ b/include/ntconf.h

		@@ -107,7 +107,9 @@ extern void FDECL(interject, (int));
107	107	#define Rand() rand()
108	108	#endif
109	109
110		-#define FCMASK 0660 /* file creation mask */
	110	+//#define FCMASK 0660 /* file creation mask */
	111	+#define FCMASK (0x0180)
	112	+
111	113	#define regularize nt_regularize
112	114	#define HLOCK "NHPERM"
113	115

--- a/nethack.sln

+++ b/nethack.sln

		@@ -1,12 +1,12 @@
1	1
2	2	Microsoft Visual Studio Solution File, Format Version 10.00
3	3	# Visual Studio 2008
4		-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcproj", "{0263CD61-31D2-493D-B9D7-B80113D51951}"
	4	+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcproj", "{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}"
5	5	ProjectSection(ProjectDependencies) = postProject
6	6	{26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}
7	7	{DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}
8	8	{F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}
9		- {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
	9	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
10	10	{4BC0B0F2-A002-42E1-BA0B-EC5425566312} = {4BC0B0F2-A002-42E1-BA0B-EC5425566312}
11	11	{BA9A3FD6-9E18-400F-9113-B09D7EDCF18D} = {BA9A3FD6-9E18-400F-9113-B09D7EDCF18D}
12	12	{388B03B5-6B10-4C0F-ACEB-5FBF4F03385B} = {388B03B5-6B10-4C0F-ACEB-5FBF4F03385B}

		@@ -19,14 +19,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "build\dgncomp.vc
19	19	EndProject
20	20	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgnstuff", "build\dgnstuff.vcproj", "{D86C7AE7-2F17-4808-900B-92F8FEB9C0D8}"
21	21	ProjectSection(ProjectDependencies) = postProject
22		- {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
	22	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
23	23	EndProjectSection
24	24	EndProject
25	25	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb_main", "build\dlb_main.vcproj", "{DCB301B2-6766-44F4-BD76-AA1F2526F6C7}"
26	26	ProjectSection(ProjectDependencies) = postProject
27	27	{26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}
28	28	{F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}
29		- {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
	29	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
30	30	EndProjectSection
31	31	EndProject
32	32	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vcproj", "{F36B67E6-91F8-4023-AA15-5D896AAF2EC0}"

		@@ -36,14 +36,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vc
36	36	EndProject
37	37	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levstuff", "build\levstuff.vcproj", "{6224BEE2-0883-426E-ADFD-F0293EB387F6}"
38	38	ProjectSection(ProjectDependencies) = postProject
39		- {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
	39	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
40	40	EndProjectSection
41	41	EndProject
42		-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcproj", "{04709C3E-D077-4706-B991-D710C26FE86E}"
	42	+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcproj", "{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}"
43	43	EndProject
44	44	Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "build\recover.vcproj", "{E5033EEA-B743-4678-A4A8-2ADDE29F297D}"
45	45	ProjectSection(ProjectDependencies) = postProject
46		- {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}
	46	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}
47	47	{DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}
48	48	EndProjectSection
49	49	EndProject

		@@ -64,10 +64,10 @@ Global
64	64	Release\|Win32 = Release\|Win32
65	65	EndGlobalSection
66	66	GlobalSection(ProjectConfigurationPlatforms) = postSolution
67		- {0263CD61-31D2-493D-B9D7-B80113D51951}.Debug\|Win32.ActiveCfg = Debug\|Win32
68		- {0263CD61-31D2-493D-B9D7-B80113D51951}.Debug\|Win32.Build.0 = Debug\|Win32
69		- {0263CD61-31D2-493D-B9D7-B80113D51951}.Release\|Win32.ActiveCfg = Release\|Win32
70		- {0263CD61-31D2-493D-B9D7-B80113D51951}.Release\|Win32.Build.0 = Release\|Win32
	67	+ {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Debug\|Win32.ActiveCfg = Debug\|Win32
	68	+ {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Debug\|Win32.Build.0 = Debug\|Win32
	69	+ {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Release\|Win32.ActiveCfg = Release\|Win32
	70	+ {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Release\|Win32.Build.0 = Release\|Win32
71	71	{26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug\|Win32.ActiveCfg = Debug\|Win32
72	72	{26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug\|Win32.Build.0 = Debug\|Win32
73	73	{26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Release\|Win32.ActiveCfg = Release\|Win32

		@@ -88,10 +88,10 @@ Global
88	88	{6224BEE2-0883-426E-ADFD-F0293EB387F6}.Debug\|Win32.Build.0 = Debug\|Win32
89	89	{6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release\|Win32.ActiveCfg = Release\|Win32
90	90	{6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release\|Win32.Build.0 = Release\|Win32
91		- {04709C3E-D077-4706-B991-D710C26FE86E}.Debug\|Win32.ActiveCfg = Debug\|Win32
92		- {04709C3E-D077-4706-B991-D710C26FE86E}.Debug\|Win32.Build.0 = Debug\|Win32
93		- {04709C3E-D077-4706-B991-D710C26FE86E}.Release\|Win32.ActiveCfg = Release\|Win32
94		- {04709C3E-D077-4706-B991-D710C26FE86E}.Release\|Win32.Build.0 = Release\|Win32
	91	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Debug\|Win32.ActiveCfg = Debug\|Win32
	92	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Debug\|Win32.Build.0 = Debug\|Win32
	93	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Release\|Win32.ActiveCfg = Release\|Win32
	94	+ {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Release\|Win32.Build.0 = Release\|Win32
95	95	{E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug\|Win32.ActiveCfg = Debug\|Win32
96	96	{E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug\|Win32.Build.0 = Debug\|Win32
97	97	{E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Release\|Win32.ActiveCfg = Release\|Win32

--- a/util/makedefs.c

+++ b/util/makedefs.c

		@@ -543,8 +543,12 @@ const char *build_date;
543	543	void
544	544	do_date()
545	545	{
	546	+#ifdef KR1ED
546	547	long clocktim = 0;
547		- char *c, cbuf[60], buf[BUFSZ];
	548	+#else
	549	+ time_t clocktim;
	550	+#endif
	551	+ char *c, cbuf[256], buf[BUFSZ];
548	552	const char *ul_sfx;
549	553
550	554	filename[0]='\0';

Show on old repository browser

nethackexpress Fork

trunk: 提交

Commit MetaInfo

Log Message

Change Summary

差異

nethackexpress
Fork