Add tile generation sub-project to win32

diff --git a/sys/winnt/nhsetup.bat b/sys/winnt/nhsetup.bat
index 407cebdba1ff749b27149111236a7ee2044d2887..68736f3559090ab5adba108c3593117e449ac9c5 100755 (executable)
--- a/sys/winnt/nhsetup.bat
+++ b/sys/winnt/nhsetup.bat
@@ -65,6 +65,8 @@ copy ..\..\win\win32\levstuff.mak  ..\..\build >nul
 copy ..\..\win\win32\makedefs.dsp  ..\..\build >nul
 copy ..\..\win\win32\recover.dsp   ..\..\build >nul
 copy ..\..\win\win32\tile2bmp.dsp  ..\..\build >nul
+copy ..\..\win\win32\tiles.dsp     ..\..\build >nul
+copy ..\..\win\win32\tiles.mak     ..\..\build >nul
 copy ..\..\win\win32\tilemap.dsp   ..\..\build >nul
 copy ..\..\win\win32\winhack.dsp   ..\..\build >nul
 

diff --git a/win/win32/nethack.dsw b/win/win32/nethack.dsw
index dfe97984b3eafc130b863a7b83fb6362c827e498..60c584e90ccbd9e4f6155bb8434b8efbe499e384 100644 (file)
--- a/win/win32/nethack.dsw
+++ b/win/win32/nethack.dsw
@@ -138,6 +138,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "tiles"=.\build\tiles.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name tile2bmp
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "winhack"=.\build\winhack.dsp - Package Owner=<4>
 
 Package=<5>
@@ -162,10 +177,10 @@ Package=<4>
     Project_Dep_Name recover
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name tile2bmp
+    Project_Dep_Name tilemap
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name tilemap
+    Project_Dep_Name tiles
     End Project Dependency
 }}}
 

diff --git a/win/win32/tile2bmp.dsp b/win/win32/tile2bmp.dsp
index 02a34c1dd9826739f7206eca376d3dcca94e1977..a06ca05ac42bcdbd2f0f59535324dc4d381bb370 100644 (file)
--- a/win/win32/tile2bmp.dsp
+++ b/win/win32/tile2bmp.dsp
@@ -52,11 +52,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\util\tile2bmp.exe"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Building nhtiles.bmp
-PostBuild_Cmds=pushd ..\src    ..\util\tile2bmp.exe tiles.bmp  if exist tiles.bmp copy tiles.bmp ..\win\win32  popd
-# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "tile2bmp - Win32 Debug"
 
@@ -81,11 +76,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\util\tile2bmp.exe" /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Building tiles.bmp
-PostBuild_Cmds=pushd ..\src    ..\util\tile2bmp.exe tiles.bmp  if exist tiles.bmp copy tiles.bmp ..\win\win32  popd
-# End Special Build Tool
 
 !ENDIF 
 

diff --git a/win/win32/tiles.dsp b/win/win32/tiles.dsp
new file mode 100644 (file)
index 0000000..414e4be
--- /dev/null
+++ b/win/win32/tiles.dsp
@@ -0,0 +1,97 @@
+# Microsoft Developer Studio Project File - Name="tiles" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=tiles - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "tiles.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "tiles.mak" CFG="tiles - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "tiles - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "tiles - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "tiles - Win32 Release"
+
+# PROP BASE Use_MFC
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f tiles.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "tiles.exe"
+# PROP BASE Bsc_Name "tiles.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "nmake /f "tiles.mak""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "..\win\win32\tiles.bmp"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "tiles - Win32 Debug"
+
+# PROP BASE Use_MFC
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f tiles.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "tiles.exe"
+# PROP BASE Bsc_Name "tiles.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "nmake /f "tiles.mak""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "..\win\win32\tiles.bmp"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ENDIF 
+
+# Begin Target
+
+# Name "tiles - Win32 Release"
+# Name "tiles - Win32 Debug"
+
+!IF  "$(CFG)" == "tiles - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "tiles - Win32 Debug"
+
+!ENDIF 
+
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

diff --git a/win/win32/tiles.mak b/win/win32/tiles.mak
new file mode 100644 (file)
index 0000000..26af1ea
--- /dev/null
+++ b/win/win32/tiles.mak
@@ -0,0 +1,21 @@
+default: all
+
+all: ..\win\win32\tiles.bmp
+
+clean:
+       -del ..\src\win\win32\tiles.bmp
+       -del ..\win\win32\tiles.bmp
+
+#==========================================
+# Building the tiles file tile.bmp
+#==========================================
+
+..\src\tiles.bmp : ..\win\share\monsters.txt ..\win\share\objects.txt \
+                        ..\win\share\other.txt
+          chdir ..\src
+          ..\util\tile2bmp.exe tiles.bmp
+          chdir ..\build
+
+..\win\win32\tiles.bmp: ..\src\tiles.bmp
+       @copy ..\src\tiles.bmp ..\win\win32\tiles.bmp
+