From 6c749785e8eda2760bca030a22e760926378c679 Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Thu, 14 Mar 2002 12:54:06 +0000
Subject: [PATCH] Move tile2bmp.c to win/share

This is so it can be shared with Qt.
If, for some reason, we have to cut another source tarball for
3.4.0, then this will be included.  Otherwise, this will
turn out to be a post-3.4.0 patch.
---
 Files                           | 11 ++++++-----
 sys/winnt/Makefile.bcc          |  4 ++--
 sys/winnt/Makefile.gcc          |  8 ++++----
 sys/winnt/Makefile.msc          |  8 ++++----
 win/{win32 => share}/tile2bmp.c |  0
 win/win32/tile2bmp.dsp          |  2 +-
 6 files changed, 17 insertions(+), 16 deletions(-)
 rename win/{win32 => share}/tile2bmp.c (100%)

diff --git a/Files b/Files
index 668010e78..6ea0e332f 100644
--- a/Files
+++ b/Files
@@ -216,14 +216,15 @@ gntext.h        gnyesno.c       gnyesno.h       gn_xpms.h       mapbg.xpm
 win/share:
 (files for versions using optional tiles)
 gifread.c       monsters.txt    objects.txt     other.txt       ppmwrite.c
-thintile.c      tile.doc        tile.h          tilemap.c       tiletext.c
+thintile.c      tile.doc        tile.h          tile2bmp.c      tilemap.c
+tiletext.c
 
 win/tty:
 (files for tty versions)
 getline.c       termcap.c       topl.c          wintty.c
 
 win/win32:
-(files for Windows NT and Windows 2000 version)
+(files for Windows 9x, NT, Windows 2000, and Windows XP version)
 dgncomp.dsp     dgnstuff.dsp    dgnstuff.mak    dlb_main.dsp    levcomp.dsp
 levstuff.dsp    levstuff.mak    makedefs.dsp    mhaskyn.c       mhaskyn.h
 mhdlg.c         mhdlg.h         mhfont.c        mhfont.h        mhinput.c
@@ -232,9 +233,9 @@ mhmenu.c        mhmenu.h        mhmsg.h         mhmsgwnd.c      mhmsgwnd.h
 mhrip.c         mhrip.h         mhsplash.h      mhsplash.c      mhstatus.c
 mhstatus.h      mhtext.c        mhtext.h        mnsel.uu        mnselcnt.uu
 mnunsel.uu      mswproc.c       nethack.dsw     nethackw.dsp    petmark.uu
-recover.dsp     resource.h      splash.uu       tile2bmp.c      tile2bmp.dsp
-tilemap.dsp     tiles.dsp       tiles.mak       winhack.c       winhack.h
-winhack.rc      winMS.h
+recover.dsp     resource.h      splash.uu       tile2bmp.dsp    tilemap.dsp
+tiles.dsp       tiles.mak       winhack.c       winhack.h       winhack.rc
+winMS.h
 
 
 
diff --git a/sys/winnt/Makefile.bcc b/sys/winnt/Makefile.bcc
index 50ea35fea..ab3e38cb1 100644
--- a/sys/winnt/Makefile.bcc
+++ b/sys/winnt/Makefile.bcc
@@ -954,8 +954,8 @@ $(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXT_IO) $(SRC)\uuid.lib
 	@$(link) $(LFLAGSU) $(startobj) $(O)tile2bmp.o $(TEXT_IO), $@,,$(libsmt)
 
 
-$(O)tile2bmp.o: $(WIN32)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
-	@$(cc) $(CFLAGS) -I$(WSHR) /DPACKED_FILE -o$@ $(WIN32)\tile2bmp.c
+$(O)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
+	@$(cc) $(CFLAGS) -I$(WSHR) /DPACKED_FILE -o$@ $(WSHR)\tile2bmp.c
 
 #==========================================
 # Housekeeping
diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index 9743c443c..493d6b9b8 100644
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -947,11 +947,11 @@ $(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32)
 	@echo Linking $@...
 	@$(link) $(LFLAGSU) -o$@ $(O)til2bm32.o $(TEXT_IO32)
 
-$(O)tile2bmp.o: $(WIN32)/tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h
-	@$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WIN32)/tile2bmp.c
+$(O)tile2bmp.o: $(WSHR)/tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h
+	@$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/tile2bmp.c
 
-$(O)til2bm32.o: $(WIN32)/til2bm32.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h
-	@$(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WIN32)/til2bm32.c
+$(O)til2bm32.o: $(WSHR)/til2bm32.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h
+	@$(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/til2bm32.c
 
 #==========================================
 # Housekeeping
diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 490ac047a..08061cd7b 100644
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -982,11 +982,11 @@ $(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32)
 		)
 <<
 
-$(O)tile2bmp.o: $(WIN32)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
-	@$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WIN32)\tile2bmp.c
+$(O)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
+	@$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)\tile2bmp.c
 
-$(O)til2bm32.o: $(WIN32)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
-	@$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WIN32)\tile2bmp.c
+$(O)til2bm32.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
+	@$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)\tile2bmp.c
 
 #==========================================
 # Housekeeping
diff --git a/win/win32/tile2bmp.c b/win/share/tile2bmp.c
similarity index 100%
rename from win/win32/tile2bmp.c
rename to win/share/tile2bmp.c
diff --git a/win/win32/tile2bmp.dsp b/win/win32/tile2bmp.dsp
index a06ca05ac..429fbe66d 100644
--- a/win/win32/tile2bmp.dsp
+++ b/win/win32/tile2bmp.dsp
@@ -104,7 +104,7 @@ SOURCE=..\src\objects.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\win\win32\tile2bmp.c
+SOURCE=..\win\share\tile2bmp.c
 
 !IF  "$(CFG)" == "tile2bmp - Win32 Release"