OSDN Git Service

(root) / nethackexpress / trunk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 91caa38)
modify for VS2008
authorunknown <shira@.(none)>
Sun, 18 Sep 2011 15:35:08 +0000 (00:35 +0900)
committerunknown <shira@.(none)>
Sun, 18 Sep 2011 15:35:08 +0000 (00:35 +0900)
build/NetHackW.vcproj patch | blob | history
build/makedefs.vcproj patch | blob | history
include/ntconf.h patch | blob | history
nethack.sln patch | blob | history
util/makedefs.c patch | blob | history

diff --git a/build/NetHackW.vcproj b/build/NetHackW.vcproj
index 4da848a..6f328f1 100644 (file)
--- a/build/NetHackW.vcproj
+++ b/build/NetHackW.vcproj
@@ -3,7 +3,8 @@
        ProjectType="Visual C++"\r
        Version="9.00"\r
        Name="NetHackW"\r
        ProjectType="Visual C++"\r
        Version="9.00"\r
        Name="NetHackW"\r
-       ProjectGUID="{0263CD61-31D2-493D-B9D7-B80113D51951}"\r
+       ProjectGUID="{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}"\r
+       RootNamespace="NetHackW"\r
        TargetFrameworkVersion="0"\r
        >\r
        <Platforms>\r
        TargetFrameworkVersion="0"\r
        >\r
        <Platforms>\r
@@ -47,7 +48,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/Gs /Oi- "\r
+                               AdditionalOptions="/wd 4996"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                OmitFramePointers="true"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                OmitFramePointers="true"\r
@@ -149,6 +150,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/wd 4996"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\win\win32,..\include,..\sys\winnt,..\sys\share,..\win\share"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\win\win32,..\include,..\sys\winnt,..\sys\share,..\win\share"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DLB;MSWIN_GRAPHICS"\r
diff --git a/build/makedefs.vcproj b/build/makedefs.vcproj
index 960de39..1f090c8 100644 (file)
--- a/build/makedefs.vcproj
+++ b/build/makedefs.vcproj
@@ -3,7 +3,8 @@
        ProjectType="Visual C++"\r
        Version="9.00"\r
        Name="makedefs"\r
        ProjectType="Visual C++"\r
        Version="9.00"\r
        Name="makedefs"\r
-       ProjectGUID="{04709C3E-D077-4706-B991-D710C26FE86E}"\r
+       ProjectGUID="{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}"\r
+       RootNamespace="makedefs"\r
        TargetFrameworkVersion="0"\r
        >\r
        <Platforms>\r
        TargetFrameworkVersion="0"\r
        >\r
        <Platforms>\r
@@ -43,6 +44,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/wd 4996"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".,..\include,..\sys\winnt"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".,..\include,..\sys\winnt"\r
@@ -134,6 +136,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               AdditionalOptions="/wd 4996"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".,..\include,..\sys\winnt"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".,..\include,..\sys\winnt"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WIN32CON;DLB;MSWIN_GRAPHICS"\r
diff --git a/include/ntconf.h b/include/ntconf.h
index dea4733..6cacc66 100644 (file)
--- a/include/ntconf.h
+++ b/include/ntconf.h
@@ -107,7 +107,9 @@ extern void FDECL(interject, (int));
 #define Rand() rand()
 #endif
 
 #define Rand() rand()
 #endif
 
-#define FCMASK 0660    /* file creation mask */
+//#define FCMASK       0660    /* file creation mask */
+#define FCMASK (0x0180)
+\r
 #define regularize     nt_regularize
 #define HLOCK "NHPERM"
 
 #define regularize     nt_regularize
 #define HLOCK "NHPERM"
 
diff --git a/nethack.sln b/nethack.sln
index 1aa08d9..ae8710d 100644 (file)
--- a/nethack.sln
+++ b/nethack.sln
@@ -1,12 +1,12 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 10.00\r
 # Visual Studio 2008\r
 \r
 Microsoft Visual Studio Solution File, Format Version 10.00\r
 # Visual Studio 2008\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcproj", "{0263CD61-31D2-493D-B9D7-B80113D51951}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "build\NetHackW.vcproj", "{4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}\r
                {DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}\r
                {F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}\r
        ProjectSection(ProjectDependencies) = postProject\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}\r
                {DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}\r
                {F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}\r
-               {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}\r
                {4BC0B0F2-A002-42E1-BA0B-EC5425566312} = {4BC0B0F2-A002-42E1-BA0B-EC5425566312}\r
                {BA9A3FD6-9E18-400F-9113-B09D7EDCF18D} = {BA9A3FD6-9E18-400F-9113-B09D7EDCF18D}\r
                {388B03B5-6B10-4C0F-ACEB-5FBF4F03385B} = {388B03B5-6B10-4C0F-ACEB-5FBF4F03385B}\r
                {4BC0B0F2-A002-42E1-BA0B-EC5425566312} = {4BC0B0F2-A002-42E1-BA0B-EC5425566312}\r
                {BA9A3FD6-9E18-400F-9113-B09D7EDCF18D} = {BA9A3FD6-9E18-400F-9113-B09D7EDCF18D}\r
                {388B03B5-6B10-4C0F-ACEB-5FBF4F03385B} = {388B03B5-6B10-4C0F-ACEB-5FBF4F03385B}\r
@@ -19,14 +19,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "build\dgncomp.vc
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgnstuff", "build\dgnstuff.vcproj", "{D86C7AE7-2F17-4808-900B-92F8FEB9C0D8}"\r
        ProjectSection(ProjectDependencies) = postProject\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgnstuff", "build\dgnstuff.vcproj", "{D86C7AE7-2F17-4808-900B-92F8FEB9C0D8}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb_main", "build\dlb_main.vcproj", "{DCB301B2-6766-44F4-BD76-AA1F2526F6C7}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}\r
                {F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb_main", "build\dlb_main.vcproj", "{DCB301B2-6766-44F4-BD76-AA1F2526F6C7}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5} = {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}\r
                {F36B67E6-91F8-4023-AA15-5D896AAF2EC0} = {F36B67E6-91F8-4023-AA15-5D896AAF2EC0}\r
-               {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vcproj", "{F36B67E6-91F8-4023-AA15-5D896AAF2EC0}"\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vcproj", "{F36B67E6-91F8-4023-AA15-5D896AAF2EC0}"\r
@@ -36,14 +36,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "build\levcomp.vc
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levstuff", "build\levstuff.vcproj", "{6224BEE2-0883-426E-ADFD-F0293EB387F6}"\r
        ProjectSection(ProjectDependencies) = postProject\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levstuff", "build\levstuff.vcproj", "{6224BEE2-0883-426E-ADFD-F0293EB387F6}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}\r
        EndProjectSection\r
 EndProject\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcproj", "{04709C3E-D077-4706-B991-D710C26FE86E}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "build\makedefs.vcproj", "{ABE56163-8CD5-407B-AB84-B2E08AC7D44D}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "build\recover.vcproj", "{E5033EEA-B743-4678-A4A8-2ADDE29F297D}"\r
        ProjectSection(ProjectDependencies) = postProject\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "build\recover.vcproj", "{E5033EEA-B743-4678-A4A8-2ADDE29F297D}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {04709C3E-D077-4706-B991-D710C26FE86E} = {04709C3E-D077-4706-B991-D710C26FE86E}\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D} = {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}\r
                {DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}\r
        EndProjectSection\r
 EndProject\r
                {DCB301B2-6766-44F4-BD76-AA1F2526F6C7} = {DCB301B2-6766-44F4-BD76-AA1F2526F6C7}\r
        EndProjectSection\r
 EndProject\r
@@ -64,10 +64,10 @@ Global
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {0263CD61-31D2-493D-B9D7-B80113D51951}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {0263CD61-31D2-493D-B9D7-B80113D51951}.Debug|Win32.Build.0 = Debug|Win32\r
-               {0263CD61-31D2-493D-B9D7-B80113D51951}.Release|Win32.ActiveCfg = Release|Win32\r
-               {0263CD61-31D2-493D-B9D7-B80113D51951}.Release|Win32.Build.0 = Release|Win32\r
+               {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {4608A682-75BB-4D79-95F3-D7ED8B0E5C4B}.Release|Win32.Build.0 = Release|Win32\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug|Win32.Build.0 = Debug|Win32\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Release|Win32.ActiveCfg = Release|Win32\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Debug|Win32.Build.0 = Debug|Win32\r
                {26FA0C16-2813-4976-B2CC-0C4EF12D00C5}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -88,10 +88,10 @@ Global
                {6224BEE2-0883-426E-ADFD-F0293EB387F6}.Debug|Win32.Build.0 = Debug|Win32\r
                {6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release|Win32.ActiveCfg = Release|Win32\r
                {6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release|Win32.Build.0 = Release|Win32\r
                {6224BEE2-0883-426E-ADFD-F0293EB387F6}.Debug|Win32.Build.0 = Debug|Win32\r
                {6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release|Win32.ActiveCfg = Release|Win32\r
                {6224BEE2-0883-426E-ADFD-F0293EB387F6}.Release|Win32.Build.0 = Release|Win32\r
-               {04709C3E-D077-4706-B991-D710C26FE86E}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {04709C3E-D077-4706-B991-D710C26FE86E}.Debug|Win32.Build.0 = Debug|Win32\r
-               {04709C3E-D077-4706-B991-D710C26FE86E}.Release|Win32.ActiveCfg = Release|Win32\r
-               {04709C3E-D077-4706-B991-D710C26FE86E}.Release|Win32.Build.0 = Release|Win32\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {ABE56163-8CD5-407B-AB84-B2E08AC7D44D}.Release|Win32.Build.0 = Release|Win32\r
                {E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug|Win32.Build.0 = Debug|Win32\r
                {E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Release|Win32.ActiveCfg = Release|Win32\r
                {E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Debug|Win32.Build.0 = Debug|Win32\r
                {E5033EEA-B743-4678-A4A8-2ADDE29F297D}.Release|Win32.ActiveCfg = Release|Win32\r
diff --git a/util/makedefs.c b/util/makedefs.c
index 23dace2..4cac55b 100644 (file)
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -543,8 +543,12 @@ const char *build_date;
 void
 do_date()
 {
 void
 do_date()
 {
+#ifdef KR1ED
        long clocktim = 0;
        long clocktim = 0;
-       char *c, cbuf[60], buf[BUFSZ];
+#else
+       time_t clocktim;
+#endif
+       char *c, cbuf[256], buf[BUFSZ];
        const char *ul_sfx;
 
        filename[0]='\0';
        const char *ul_sfx;
 
        filename[0]='\0';
メインリポジトリ
About OSDN
Find Software
Develop Software
Help