<Someone>'s changes for the makefiles.
This commit is contained in:
@@ -49,10 +49,14 @@ nhsplash.xpm: ../win/Qt/nhsplash.xpm
|
|||||||
../util/tile2img.ttp:
|
../util/tile2img.ttp:
|
||||||
(cd ../util ; make tile2img.ttp)
|
(cd ../util ; make tile2img.ttp)
|
||||||
|
|
||||||
|
../util/xpm2img.ttp:
|
||||||
|
(cd ../util ; make xpm2img.ttp)
|
||||||
nh16.img: ../util/tile2img.ttp ../win/share/monsters.txt \
|
nh16.img: ../util/tile2img.ttp ../win/share/monsters.txt \
|
||||||
../win/share/objects.txt ../win/share/other.txt
|
../win/share/objects.txt ../win/share/other.txt
|
||||||
../util/tile2img.ttp nh16.img
|
../util/tile2img.ttp nh16.img
|
||||||
|
|
||||||
|
rip.img: ../util/xpm2img.ttp
|
||||||
|
../util/xpm2img.ttp ../win/X11/rip.xpm rip.img
|
||||||
title.img:
|
title.img:
|
||||||
# cp ../win/gem/title.img title.img
|
# cp ../win/gem/title.img title.img
|
||||||
$(UUDECODE) ../win/gem/title.uu
|
$(UUDECODE) ../win/gem/title.uu
|
||||||
@@ -121,3 +125,4 @@ dungeon: dungeon.def ../util/makedefs ../util/dgn_comp
|
|||||||
spotless:
|
spotless:
|
||||||
-rm -f spec_levs quest_levs *.lev $(VARDAT) dungeon dungeon.pdf
|
-rm -f spec_levs quest_levs *.lev $(VARDAT) dungeon dungeon.pdf
|
||||||
-rm -f nhdat x11tiles beostiles pet_mark.xbm rip.xpm mapbg.xpm
|
-rm -f nhdat x11tiles beostiles pet_mark.xbm rip.xpm mapbg.xpm
|
||||||
|
-rm -f rip.img GEM_RSC.RSC title.img nh16.img
|
||||||
|
|||||||
@@ -191,8 +191,8 @@ WINGNOMEOBJ = gnaskstr.o gnbind.o gnglyph.o gnmain.o gnmap.o gnmenu.o \
|
|||||||
#
|
#
|
||||||
# Files for a Gem port
|
# Files for a Gem port
|
||||||
WINGEMSRC = ../win/gem/wingem.c ../win/gem/wingem1.c ../win/gem/load_img.c \
|
WINGEMSRC = ../win/gem/wingem.c ../win/gem/wingem1.c ../win/gem/load_img.c \
|
||||||
tile.c
|
../win/gem/gr_rect.c tile.c
|
||||||
WINGEMOBJ = wingem.o wingem1.o load_img.o tile.o
|
WINGEMOBJ = wingem.o wingem1.o load_img.o gr_rect.o tile.o
|
||||||
#
|
#
|
||||||
# Files for a BeOS InterfaceKit port -- not ready for prime time
|
# Files for a BeOS InterfaceKit port -- not ready for prime time
|
||||||
WINBESRC =
|
WINBESRC =
|
||||||
@@ -666,6 +666,8 @@ wingem1.o: ../win/gem/wingem1.c ../include/gem_rsc.h ../include/load_img.h \
|
|||||||
$(CC) $(CFLAGS) -c ../win/gem/wingem1.c
|
$(CC) $(CFLAGS) -c ../win/gem/wingem1.c
|
||||||
load_img.o: ../win/gem/load_img.c ../include/load_img.h
|
load_img.o: ../win/gem/load_img.c ../include/load_img.h
|
||||||
$(CC) $(CFLAGS) -c ../win/gem/load_img.c
|
$(CC) $(CFLAGS) -c ../win/gem/load_img.c
|
||||||
|
gr_rect.o: ../win/gem/gr_rect.c
|
||||||
|
$(CC) $(CFLAGS) -c ../win/gem/gr_rect.c
|
||||||
tile.o: tile.c $(HACK_H)
|
tile.o: tile.c $(HACK_H)
|
||||||
qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../include/func_tab.h \
|
qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../include/func_tab.h \
|
||||||
../include/dlb.h ../include/patchlevel.h ../include/tile2x11.h \
|
../include/dlb.h ../include/patchlevel.h ../include/tile2x11.h \
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ VARDATND =
|
|||||||
# VARDATND = x11tiles pet_mark.xbm
|
# VARDATND = x11tiles pet_mark.xbm
|
||||||
# VARDATND = x11tiles pet_mark.xbm rip.xpm
|
# VARDATND = x11tiles pet_mark.xbm rip.xpm
|
||||||
# for Atari/Gem
|
# for Atari/Gem
|
||||||
# VARDATND = nh16.img title.img GEM_RSC.RSC
|
# VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
|
||||||
# for BeOS
|
# for BeOS
|
||||||
# VARDATND = beostiles
|
# VARDATND = beostiles
|
||||||
# for Gnome
|
# for Gnome
|
||||||
@@ -148,6 +148,9 @@ nh16.img: $(GAME)
|
|||||||
( cd util ; $(MAKE) tile2img.ttp )
|
( cd util ; $(MAKE) tile2img.ttp )
|
||||||
( cd dat ; $(MAKE) nh16.img )
|
( cd dat ; $(MAKE) nh16.img )
|
||||||
|
|
||||||
|
rip.img:
|
||||||
|
( cd util ; $(MAKE) xpm2img.ttp )
|
||||||
|
( cd dat ; $(MAKE) rip.img )
|
||||||
GEM_RSC.RSC:
|
GEM_RSC.RSC:
|
||||||
( cd dat ; $(MAKE) GEM_RSC.RSC )
|
( cd dat ; $(MAKE) GEM_RSC.RSC )
|
||||||
|
|
||||||
|
|||||||
@@ -304,6 +304,8 @@ tile2x11: tile2x11.o $(TEXT_IO)
|
|||||||
tile2img.ttp: tile2img.o bitmfile.o $(TEXT_IO)
|
tile2img.ttp: tile2img.o bitmfile.o $(TEXT_IO)
|
||||||
$(CC) $(LFLAGS) -o tile2img.ttp tile2img.o bitmfile.o $(TEXT_IO) $(LIBS)
|
$(CC) $(LFLAGS) -o tile2img.ttp tile2img.o bitmfile.o $(TEXT_IO) $(LIBS)
|
||||||
|
|
||||||
|
xpm2img.ttp: xpm2img.o bitmfile.o
|
||||||
|
$(CC) $(LFLAGS) -o xpm2img.ttp xpm2img.o bitmfile.o $(LIBS)
|
||||||
tile2beos: tile2beos.o $(TEXT_IO)
|
tile2beos: tile2beos.o $(TEXT_IO)
|
||||||
$(CC) $(LFLAGS) -o tile2beos tile2beos.o $(TEXT_IO) -lbe
|
$(CC) $(LFLAGS) -o tile2beos tile2beos.o $(TEXT_IO) -lbe
|
||||||
|
|
||||||
@@ -332,6 +334,8 @@ tile2x11.o: ../win/X11/tile2x11.c $(HACK_H) ../include/tile.h \
|
|||||||
tile2img.o: ../win/gem/tile2img.c $(HACK_H) ../include/tile.h \
|
tile2img.o: ../win/gem/tile2img.c $(HACK_H) ../include/tile.h \
|
||||||
../include/bitmfile.h
|
../include/bitmfile.h
|
||||||
$(CC) $(CFLAGS) -c ../win/gem/tile2img.c
|
$(CC) $(CFLAGS) -c ../win/gem/tile2img.c
|
||||||
|
xpm2img.o: ../win/gem/xpm2img.c $(HACK_H) ../include/bitmfile.h
|
||||||
|
$(CC) $(CFLAGS) -c ../win/gem/xpm2img.c
|
||||||
bitmfile.o: ../win/gem/bitmfile.c ../include/bitmfile.h
|
bitmfile.o: ../win/gem/bitmfile.c ../include/bitmfile.h
|
||||||
$(CC) $(CFLAGS) -c ../win/gem/bitmfile.c
|
$(CC) $(CFLAGS) -c ../win/gem/bitmfile.c
|
||||||
|
|
||||||
@@ -381,4 +385,4 @@ spotless: clean
|
|||||||
-rm -f ../include/lev_comp.h ../include/dgn_comp.h
|
-rm -f ../include/lev_comp.h ../include/dgn_comp.h
|
||||||
-rm -f ../include/tile.h
|
-rm -f ../include/tile.h
|
||||||
-rm -f makedefs lev_comp dgn_comp recover dlb
|
-rm -f makedefs lev_comp dgn_comp recover dlb
|
||||||
-rm -f gif2txt txt2ppm tile2x11 tile2img.ttp tilemap
|
-rm -f gif2txt txt2ppm tile2x11 tile2img.ttp xpm2img.ttp tilemap
|
||||||
|
|||||||
Reference in New Issue
Block a user