windows visual studio project build tweaks

diff --git a/include/global.h b/include/global.h
index 79b2c83a4dfa081b95e76fe58c721200b6fb1d35..e732c74b896079f0709b579dd7d502d03fd8ed77 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -220,15 +220,19 @@ typedef uchar nhsym;
 
 #if defined(X11_GRAPHICS) || defined(QT_GRAPHICS) || defined(GNOME_GRAPHICS) \
     || defined(WIN32)
+#ifndef NO_TILE_C
 #ifndef USE_TILES
 #define USE_TILES /* glyph2tile[] will be available */
 #endif
 #endif
+#endif
 #if defined(AMII_GRAPHICS) || defined(GEM_GRAPHICS)
+#ifndef NO_TILE_C
 #ifndef USE_TILES
 #define USE_TILES
 #endif
 #endif
+#endif
 
 #if defined(UNIX) || defined(VMS) || defined(__EMX__) || defined(WIN32)
 #define HANGUPHANDLING

diff --git a/sys/windows/vs/NetHack/NetHack.vcxproj b/sys/windows/vs/NetHack/NetHack.vcxproj
index 11353f065dcc5a83c50d2c295a0387d95bb3b1a4..5b80fb387a0a7b31546bc461d40f004bb739905d 100644 (file)
--- a/sys/windows/vs/NetHack/NetHack.vcxproj
+++ b/sys/windows/vs/NetHack/NetHack.vcxproj
@@ -35,7 +35,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWindDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;SAFEPROCS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32CON;NO_TILE_C;DLB;MSWIN_GRAPHICS;SAFEPROCS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;winmm.lib;Winmm.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -143,7 +143,6 @@
     <ClCompile Include="$(SrcDir)symbols.c" />\r
     <ClCompile Include="$(SrcDir)sys.c" />\r
     <ClCompile Include="$(SrcDir)teleport.c" />\r
-    <ClCompile Include="$(SrcDir)tile.c" />\r
     <ClCompile Include="$(SrcDir)timeout.c" />\r
     <ClCompile Include="$(SrcDir)topten.c" />\r
     <ClCompile Include="$(SrcDir)track.c" />\r
@@ -269,4 +268,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/sys/windows/vs/NetHackW/NetHackW.vcxproj b/sys/windows/vs/NetHackW/NetHackW.vcxproj
index 373aaca9c07ac1d31b336a4be1e8602a96970fcb..149e8db49ee852deb79b7960d5986f7754de14e6 100644 (file)
--- a/sys/windows/vs/NetHackW/NetHackW.vcxproj
+++ b/sys/windows/vs/NetHackW/NetHackW.vcxproj
@@ -213,7 +213,6 @@
     <ClInclude Include="$(IncDir)coord.h" />\r
     <ClInclude Include="$(IncDir)decl.h" />\r
     <ClInclude Include="$(IncDir)defsym.h" />\r
-    <ClInclude Include="$(IncDir)dgn_comp.h" />\r
     <ClInclude Include="$(IncDir)dgn_file.h" />\r
     <ClInclude Include="$(IncDir)display.h" />\r
     <ClInclude Include="$(IncDir)dlb.h" />\r
@@ -228,7 +227,6 @@
     <ClInclude Include="$(IncDir)hack.h" />\r
     <ClInclude Include="$(IncDir)integer.h" />\r
     <ClInclude Include="$(IncDir)isaac64.h" />\r
-    <ClInclude Include="$(IncDir)lev_comp.h" />\r
     <ClInclude Include="$(IncDir)lint.h" />\r
     <ClInclude Include="$(IncDir)load_img.h" />\r
     <ClInclude Include="$(IncDir)mail.h" />\r
@@ -306,4 +304,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="$(vsDir)NetHack\afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/sys/windows/vs/tilemap/tilemap.vcxproj b/sys/windows/vs/tilemap/tilemap.vcxproj
index 7bacd3433757b039b46428453d31ef5d65451eba..7a3d3d2fae984513578af21b70a8c206b15b28e9 100644 (file)
--- a/sys/windows/vs/tilemap/tilemap.vcxproj
+++ b/sys/windows/vs/tilemap/tilemap.vcxproj
@@ -31,6 +31,9 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="$(WinShareDir)tilemap.c" />\r
+    <ClCompile Include="$(SrcDir)drawing.c" />\r
+    <ClCompile Include="$(SrcDir)monst.c" />\r
+    <ClCompile Include="$(SrcDir)objects.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="$(IncDir)align.h" />\r
@@ -42,7 +45,6 @@
     <ClInclude Include="$(IncDir)coord.h" />\r
     <ClInclude Include="$(IncDir)decl.h" />\r
     <ClInclude Include="$(IncDir)defsym.h" />\r
-    <ClInclude Include="$(IncDir)dgn_comp.h" />\r
     <ClInclude Include="$(IncDir)dgn_file.h" />\r
     <ClInclude Include="$(IncDir)display.h" />\r
     <ClInclude Include="$(IncDir)dungeon.h" />\r