follow-up build fixes for Windows

diff --git a/sys/windows/Makefile.gcc b/sys/windows/Makefile.gcc
index f0ac847384e40d49b97110d60973e839385d6e7e..26ba1b3dead5765c660cba57ad950fec0a348a7e 100644 (file)
--- a/sys/windows/Makefile.gcc
+++ b/sys/windows/Makefile.gcc
@@ -1006,22 +1006,23 @@ $(INCL)/onames.h : $(U)makedefs.exe
 $(INCL)/pm.h : $(U)makedefs.exe
        $(subst /,\,$(U)makedefs -p)
 
-$(DAT)/data: $(O)utility.tag    $(DATABASE)
+$(DAT)/data: $(U)makedefs.exe $(O)utility.tag $(DATABASE)
        $(subst /,\,$(U)makedefs -d)
 
-$(DAT)/rumors: $(O)utility.tag    $(DAT)/rumors.tru   $(DAT)/rumors.fal
+$(DAT)/rumors: $(U)makedefs.exe $(O)utility.tag $(DAT)/rumors.tru \
+       $(DAT)/rumors.fal
        $(subst /,\,$(U)makedefs -r)
 
-$(DAT)/oracles: $(O)utility.tag    $(DAT)/oracles.txt
+$(DAT)/oracles: $(U)makedefs.exe $(O)utility.tag $(DAT)/oracles.txt
        $(subst /,\,$(U)makedefs -h)
 
-$(DAT)/engrave: $(DAT)/engrave.txt $(U)makedefs.exe
+$(DAT)/engrave: $(U)makedefs.exe $(DAT)/engrave.txt $(U)makedefs.exe
        $(subst /,\,$(U)makedefs -s)
 
-$(DAT)/epitaph: $(DAT)/epitaph.txt $(U)makedefs.exe
+$(DAT)/epitaph: $(U)makedefs.exe $(DAT)/epitaph.txt $(U)makedefs.exe
        $(subst /,\,$(U)makedefs -s)
 
-$(DAT)/bogusmon: $(DAT)/bogusmon.txt $(U)makedefs.exe
+$(DAT)/bogusmon: $(U)makedefs.exe $(DAT)/bogusmon.txt $(U)makedefs.exe
        $(subst /,\,$(U)makedefs -s)
 
 #==========================================

diff --git a/sys/windows/vs/NetHack/NetHack.vcxproj b/sys/windows/vs/NetHack/NetHack.vcxproj
index 58e48f77e93fe6348b5ae1fe32f2c11a962261bc..11353f065dcc5a83c50d2c295a0387d95bb3b1a4 100644 (file)
--- a/sys/windows/vs/NetHack/NetHack.vcxproj
+++ b/sys/windows/vs/NetHack/NetHack.vcxproj
@@ -56,6 +56,7 @@
     <ClCompile Include="$(SrcDir)botl.c" />\r
     <ClCompile Include="$(SrcDir)cmd.c" />\r
     <ClCompile Include="$(SrcDir)dbridge.c" />\r
+    <ClCompile Include="$(SrcDir)date.c" />\r
     <ClCompile Include="$(SrcDir)decl.c" />\r
     <ClCompile Include="$(SrcDir)detect.c" />\r
     <ClCompile Include="$(SrcDir)dig.c" />\r
@@ -195,7 +196,6 @@
     <ClInclude Include="$(IncDir)config1.h" />\r
     <ClInclude Include="$(IncDir)context.h" />\r
     <ClInclude Include="$(IncDir)coord.h" />\r
-    <ClInclude Include="$(IncDir)date.h" />\r
     <ClInclude Include="$(IncDir)decl.h" />\r
     <ClInclude Include="$(IncDir)defsym.h" />\r
     <ClInclude Include="$(IncDir)display.h" />\r
@@ -214,11 +214,13 @@
     <ClInclude Include="$(IncDir)monattk.h" />\r
     <ClInclude Include="$(IncDir)mondata.h" />\r
     <ClInclude Include="$(IncDir)monflag.h" />\r
+    <ClInclude Include="$(IncDir)monsters.h" />\r
     <ClInclude Include="$(IncDir)monst.h" />\r
     <ClInclude Include="$(IncDir)nhlua.h" />\r
     <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)obj.h" />\r
     <ClInclude Include="$(IncDir)objclass.h" />\r
+    <ClInclude Include="$(IncDir)objects.h" />\r
     <ClInclude Include="$(IncDir)patchlevel.h" />\r
     <ClInclude Include="$(IncDir)permonst.h" />\r
     <ClInclude Include="$(IncDir)prop.h" />\r

diff --git a/sys/windows/vs/NetHackW/NetHackW.vcxproj b/sys/windows/vs/NetHackW/NetHackW.vcxproj
index 4730c89ca3344e180dbdc98e5f0914d8d889835e..373aaca9c07ac1d31b336a4be1e8602a96970fcb 100644 (file)
--- a/sys/windows/vs/NetHackW/NetHackW.vcxproj
+++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj
@@ -49,6 +49,7 @@
     <ClCompile Include="$(SrcDir)bones.c" />\r
     <ClCompile Include="$(SrcDir)botl.c" />\r
     <ClCompile Include="$(SrcDir)cmd.c" />\r
+    <ClCompile Include="$(SrcDir)date.c" />\r
     <ClCompile Include="$(SrcDir)dbridge.c" />\r
     <ClCompile Include="$(SrcDir)decl.c" />\r
     <ClCompile Include="$(SrcDir)detect.c" />\r
@@ -210,7 +211,6 @@
     <ClInclude Include="$(IncDir)config1.h" />\r
     <ClInclude Include="$(IncDir)context.h" />\r
     <ClInclude Include="$(IncDir)coord.h" />\r
-    <ClInclude Include="$(IncDir)date.h" />\r
     <ClInclude Include="$(IncDir)decl.h" />\r
     <ClInclude Include="$(IncDir)defsym.h" />\r
     <ClInclude Include="$(IncDir)dgn_comp.h" />\r
@@ -240,10 +240,12 @@
     <ClInclude Include="$(IncDir)mondata.h" />\r
     <ClInclude Include="$(IncDir)monflag.h" />\r
     <ClInclude Include="$(IncDir)monst.h" />\r
+    <ClInclude Include="$(IncDir)monsters.h" />\r
     <ClInclude Include="$(IncDir)nhlua.h" />\r
     <ClInclude Include="$(IncDir)windconf.h" />\r
     <ClInclude Include="$(IncDir)obj.h" />\r
     <ClInclude Include="$(IncDir)objclass.h" />\r
+    <ClInclude Include="$(IncDir)objects.h" />\r
     <ClInclude Include="$(IncDir)optlist.h" />\r
     <ClInclude Include="$(IncDir)patchlevel.h" />\r
     <ClInclude Include="$(IncDir)pcconf.h" />\r

diff --git a/sys/windows/vs/makedefs/makedefs.vcxproj b/sys/windows/vs/makedefs/makedefs.vcxproj
index 87c9dd6e3b53fff6cc64433d11037095f53ccf97..330dfb757620597de4f9065a4cf2dc9c4ca28f0b 100644 (file)
--- a/sys/windows/vs/makedefs/makedefs.vcxproj
+++ b/sys/windows/vs/makedefs/makedefs.vcxproj
@@ -33,6 +33,7 @@
     <ClCompile Include="$(RootDir)util\makedefs.c" />\r
     <ClCompile Include="$(RootDir)src\monst.c" />\r
     <ClCompile Include="$(RootDir)src\objects.c" />\r
+    <ClCompile Include="..\..\..\..\src\date.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="$(IncDir)config.h" />\r
@@ -50,18 +51,15 @@
     <ClInclude Include="$(IncDir)tradstdc.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <Target\r
-      Name="GenerateHeader"\r
-      BeforeTargets="ClCompile"\r
-      Outputs="$(IncDir)\nhlua.h">\r
-      <Message Text="Generating $(IncDir)nhlua.h" />\r
-       <Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22$(SubmodulesDir)lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22$(SubmodulesDir)lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo #include %22$(SubmodulesDir)lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
-       <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>\r
- </Target>\r
+  <Target Name="GenerateHeader" BeforeTargets="ClCompile" Outputs="$(IncDir)\nhlua.h">\r
+    <Message Text="Generating $(IncDir)nhlua.h" />\r
+    <Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)" />\r
+    <Exec Command="echo #include %22$(SubmodulesDir)lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />\r
+    <Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />\r
+    <Exec Command="echo #include %22$(SubmodulesDir)lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />\r
+    <Exec Command="echo #include %22$(SubmodulesDir)lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />\r
+    <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />\r
+  </Target>\r
   <Target Name="AfterBuild">\r
     <MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
@@ -71,4 +69,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>\r
+</Project>
\ No newline at end of file