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.

diff --git a/Files b/Files
index 668010e78155b9979444d5a96127896f2cf5d06b..6ea0e332f7dddb25f4c370caa8dd06ed7b45bd76 100644 (file)
--- 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 50ea35feac8734ce148daffe31046b5cf55132c8..ab3e38cb19f973be4e1822021c89ea4eb3f0896a 100644 (file)
--- 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 9743c443ceb14c1b209ea40c477d484e58296d04..493d6b9b830ec591f8db11789d294db7dfc4ad0d 100644 (file)
--- 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 490ac047aa30c3a5f80851bfb9e8dcd26773c728..08061cd7b5bf31c8f6a29757bd2336d3748ac3e9 100644 (file)
--- 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 a06ca05ac42bcdbd2f0f59535324dc4d381bb370..429fbe66d0fce0c074520e5f08fdc4340fb37d1b 100644 (file)
--- 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"