nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Move tile2bmp.c to win/share

Browse Source 
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.
This commit is contained in:
nethack.allison
2002-03-14 12:54:06 +00:00
parent 57d8a85e50
commit 6c749785e8
6 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Files
+6 -5
View File
@@ -216,14 +216,15 @@ gntext.h gnyesno.c gnyesno.h gn_xpms.h mapbg.xpm
win/share: win/share:
(files for versions using optional tiles) (files for versions using optional tiles)
gifread.c monsters.txt objects.txt other.txt ppmwrite.c 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: win/tty:
(files for tty versions) (files for tty versions)
getline.c termcap.c topl.c wintty.c getline.c termcap.c topl.c wintty.c
win/win32: 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 dgncomp.dsp dgnstuff.dsp dgnstuff.mak dlb_main.dsp levcomp.dsp
levstuff.dsp levstuff.mak makedefs.dsp mhaskyn.c mhaskyn.h levstuff.dsp levstuff.mak makedefs.dsp mhaskyn.c mhaskyn.h
mhdlg.c mhdlg.h mhfont.c mhfont.h mhinput.c 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 mhrip.c mhrip.h mhsplash.h mhsplash.c mhstatus.c
mhstatus.h mhtext.c mhtext.h mnsel.uu mnselcnt.uu mhstatus.h mhtext.c mhtext.h mnsel.uu mnselcnt.uu
mnunsel.uu mswproc.c nethack.dsw nethackw.dsp petmark.uu mnunsel.uu mswproc.c nethack.dsw nethackw.dsp petmark.uu
recover.dsp resource.h splash.uu tile2bmp.c tile2bmp.dsp recover.dsp resource.h splash.uu tile2bmp.dsp tilemap.dsp
tilemap.dsp tiles.dsp tiles.mak winhack.c winhack.h tiles.dsp tiles.mak winhack.c winhack.h winhack.rc
winhack.rc winMS.h winMS.h
sys/winnt/Makefile.bcc
+2 -2
View File
@@ -954,8 +954,8 @@ $(U)tile2bmp.exe: $(O)tile2bmp.o $(TEXT_IO) $(SRC)\uuid.lib
@$(link) $(LFLAGSU) $(startobj) $(O)tile2bmp.o $(TEXT_IO), $@,,$(libsmt) @$(link) $(LFLAGSU) $(startobj) $(O)tile2bmp.o $(TEXT_IO), $@,,$(libsmt)
$(O)tile2bmp.o: $(WIN32)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(O)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
@$(cc) $(CFLAGS) -I$(WSHR) /DPACKED_FILE -o$@ $(WIN32)\tile2bmp.c @$(cc) $(CFLAGS) -I$(WSHR) /DPACKED_FILE -o$@ $(WSHR)\tile2bmp.c
#========================================== #==========================================
# Housekeeping # Housekeeping
sys/winnt/Makefile.gcc
+4 -4
View File
@@ -947,11 +947,11 @@ $(U)til2bm32.exe: $(O)til2bm32.o $(TEXT_IO32)
@echo Linking $@... @echo Linking $@...
@$(link) $(LFLAGSU) -o$@ $(O)til2bm32.o $(TEXT_IO32) @$(link) $(LFLAGSU) -o$@ $(O)til2bm32.o $(TEXT_IO32)
$(O)tile2bmp.o: $(WIN32)/tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h $(O)tile2bmp.o: $(WSHR)/tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h
@$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WIN32)/tile2bmp.c @$(cc) $(CFLAGS) -I$(WSHR) -o$@ $(WSHR)/tile2bmp.c
$(O)til2bm32.o: $(WIN32)/til2bm32.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h $(O)til2bm32.o: $(WSHR)/til2bm32.c $(HACK_H) $(TILE_H) $(INCL)/win32api.h
@$(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WIN32)/til2bm32.c @$(cc) $(CFLAGS) -I$(WSHR) -DTILE_X=32 -DTILE_Y=32 -o$@ $(WSHR)/til2bm32.c
#========================================== #==========================================
# Housekeeping # Housekeeping
sys/winnt/Makefile.msc
+4 -4
View File
@@ -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 $(O)tile2bmp.o: $(WSHR)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h
@$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WIN32)\tile2bmp.c @$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /Fo$@ $(WSHR)\tile2bmp.c
$(O)til2bm32.o: $(WIN32)\tile2bmp.c $(HACK_H) $(TILE_H) $(INCL)\win32api.h $(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$@ $(WIN32)\tile2bmp.c @$(CC) $(CFLAGS) -I$(WSHR) /DPACKED_FILE /DTILE_X=32 /DTILE_Y=32 /Fo$@ $(WSHR)\tile2bmp.c
#========================================== #==========================================
# Housekeeping # Housekeeping
win/win32/tile2bmp.c → win/share/tile2bmp.c
View File
win/win32/tile2bmp.dsp
+1 -1
View File
@@ -104,7 +104,7 @@ SOURCE=..\src\objects.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\win\win32\tile2bmp.c SOURCE=..\win\share\tile2bmp.c
!IF "$(CFG)" == "tile2bmp - Win32 Release" !IF "$(CFG)" == "tile2bmp - Win32 Release"