diff --git a/sys/unix/Makefile.dat b/sys/unix/Makefile.dat index a691fce82..cdf004f40 100644 --- a/sys/unix/Makefile.dat +++ b/sys/unix/Makefile.dat @@ -24,6 +24,9 @@ all: $(VARDAT) spec_levs quest_levs dungeon ../util/tile2beos: (cd ../util ; make tile2beos) +../util/tile2bmp: + (cd ../util ; make tile2bmp) + x11tiles: ../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \ ../win/share/other.txt ../util/tile2x11 ../win/share/monsters.txt ../win/share/objects.txt \ @@ -34,6 +37,10 @@ beostiles: ../util/tile2beos ../win/share/monsters.txt ../win/share/objects.txt ../util/tile2beos ../win/share/monsters.txt ../win/share/objects.txt \ ../win/share/other.txt +nhtiles.bmp: ../util/tile2bmp ../win/share/monsters.txt ../win/share/objects.txt \ + ../win/share/other.txt + ../util/tile2bmp $@ + pet_mark.xbm: ../win/X11/pet_mark.xbm cp ../win/X11/pet_mark.xbm pet_mark.xbm diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl index ec560b61a..99ca0b8b5 100644 --- a/sys/unix/Makefile.utl +++ b/sys/unix/Makefile.utl @@ -304,8 +304,12 @@ tile2x11: tile2x11.o $(TEXT_IO) tile2img.ttp: tile2img.o bitmfile.o $(TEXT_IO) $(CC) $(LFLAGS) -o tile2img.ttp tile2img.o bitmfile.o $(TEXT_IO) $(LIBS) +tile2bmp: tile2bmp.o $(TEXT_IO) + $(CC) $(LFLAGS) -o tile2bmp tile2bmp.o $(TEXT_IO) + xpm2img.ttp: xpm2img.o bitmfile.o $(CC) $(LFLAGS) -o xpm2img.ttp xpm2img.o bitmfile.o $(LIBS) + tile2beos: tile2beos.o $(TEXT_IO) $(CC) $(LFLAGS) -o tile2beos tile2beos.o $(TEXT_IO) -lbe @@ -386,3 +390,7 @@ spotless: clean -rm -f ../include/tile.h -rm -f makedefs lev_comp dgn_comp recover dlb -rm -f gif2txt txt2ppm tile2x11 tile2img.ttp xpm2img.ttp tilemap + +tileedit: tileedit.cpp $(TEXT_IO) + $(QTDIR)/bin/moc -o tileedit.moc tileedit.h + $(CC) -o tileedit -I../include -I$(QTDIR)/include -L$(QTDIR)/lib tileedit.cpp $(TEXT_IO) -lqt