follow-up build fixes for Windows

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)
 
 #==========================================

sys/windows/vs/NetHack/NetHack.vcxproj

@@ -56,6 +56,7 @@
     <ClCompile Include="$(SrcDir)botl.c" />
     <ClCompile Include="$(SrcDir)cmd.c" />
     <ClCompile Include="$(SrcDir)dbridge.c" />
+    <ClCompile Include="$(SrcDir)date.c" />
     <ClCompile Include="$(SrcDir)decl.c" />
     <ClCompile Include="$(SrcDir)detect.c" />
     <ClCompile Include="$(SrcDir)dig.c" />
@@ -195,7 +196,6 @@
     <ClInclude Include="$(IncDir)config1.h" />
     <ClInclude Include="$(IncDir)context.h" />
     <ClInclude Include="$(IncDir)coord.h" />
-    <ClInclude Include="$(IncDir)date.h" />
     <ClInclude Include="$(IncDir)decl.h" />
     <ClInclude Include="$(IncDir)defsym.h" />
     <ClInclude Include="$(IncDir)display.h" />
@@ -214,11 +214,13 @@
     <ClInclude Include="$(IncDir)monattk.h" />
     <ClInclude Include="$(IncDir)mondata.h" />
     <ClInclude Include="$(IncDir)monflag.h" />
+    <ClInclude Include="$(IncDir)monsters.h" />
     <ClInclude Include="$(IncDir)monst.h" />
     <ClInclude Include="$(IncDir)nhlua.h" />
     <ClInclude Include="$(IncDir)windconf.h" />
     <ClInclude Include="$(IncDir)obj.h" />
     <ClInclude Include="$(IncDir)objclass.h" />
+    <ClInclude Include="$(IncDir)objects.h" />
     <ClInclude Include="$(IncDir)patchlevel.h" />
     <ClInclude Include="$(IncDir)permonst.h" />
     <ClInclude Include="$(IncDir)prop.h" />

sys/windows/vs/NetHackW/NetHackW.vcxproj

@@ -49,6 +49,7 @@
     <ClCompile Include="$(SrcDir)bones.c" />
     <ClCompile Include="$(SrcDir)botl.c" />
     <ClCompile Include="$(SrcDir)cmd.c" />
+    <ClCompile Include="$(SrcDir)date.c" />
     <ClCompile Include="$(SrcDir)dbridge.c" />
     <ClCompile Include="$(SrcDir)decl.c" />
     <ClCompile Include="$(SrcDir)detect.c" />
@@ -210,7 +211,6 @@
     <ClInclude Include="$(IncDir)config1.h" />
     <ClInclude Include="$(IncDir)context.h" />
     <ClInclude Include="$(IncDir)coord.h" />
-    <ClInclude Include="$(IncDir)date.h" />
     <ClInclude Include="$(IncDir)decl.h" />
     <ClInclude Include="$(IncDir)defsym.h" />
     <ClInclude Include="$(IncDir)dgn_comp.h" />
@@ -240,10 +240,12 @@
     <ClInclude Include="$(IncDir)mondata.h" />
     <ClInclude Include="$(IncDir)monflag.h" />
     <ClInclude Include="$(IncDir)monst.h" />
+    <ClInclude Include="$(IncDir)monsters.h" />
     <ClInclude Include="$(IncDir)nhlua.h" />
     <ClInclude Include="$(IncDir)windconf.h" />
     <ClInclude Include="$(IncDir)obj.h" />
     <ClInclude Include="$(IncDir)objclass.h" />
+    <ClInclude Include="$(IncDir)objects.h" />
     <ClInclude Include="$(IncDir)optlist.h" />
     <ClInclude Include="$(IncDir)patchlevel.h" />
     <ClInclude Include="$(IncDir)pcconf.h" />

sys/windows/vs/makedefs/makedefs.vcxproj

@@ -33,6 +33,7 @@
     <ClCompile Include="$(RootDir)util\makedefs.c" />
     <ClCompile Include="$(RootDir)src\monst.c" />
     <ClCompile Include="$(RootDir)src\objects.c" />
+    <ClCompile Include="..\..\..\..\src\date.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(IncDir)config.h" />
@@ -50,18 +51,15 @@
     <ClInclude Include="$(IncDir)tradstdc.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target
+  <Target Name="GenerateHeader" BeforeTargets="ClCompile" Outputs="$(IncDir)\nhlua.h">
-      Name="GenerateHeader"
+    <Message Text="Generating $(IncDir)nhlua.h" />
-      BeforeTargets="ClCompile"
+    <Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-      Outputs="$(IncDir)\nhlua.h">
+    <Exec Command="echo #include %22$(SubmodulesDir)lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-      <Message Text="Generating $(IncDir)nhlua.h" />
+    <Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-	<Exec Command="echo /* nhlua.h - generated by makdefs.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+    <Exec Command="echo #include %22$(SubmodulesDir)lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-	<Exec Command="echo #include %22$(SubmodulesDir)lua/lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+    <Exec Command="echo #include %22$(SubmodulesDir)lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-	<Exec Command="echo LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+    <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-	<Exec Command="echo #include %22$(SubmodulesDir)lua/lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
+  </Target>
-	<Exec Command="echo #include %22$(SubmodulesDir)lua/lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
-	<Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)"/>
- </Target>
   <Target Name="AfterBuild">
     <MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>