Add PNG support

This commit is contained in:
Ray Chason
2026-08-24 12:02:35 -04:00
committed by Ray Chason
parent cc47605531
commit a575fccf08
4 changed files with 166 additions and 2 deletions
+6 -2
View File
@@ -261,12 +261,13 @@ WINX11SRC ?= ../win/X11/Window.c ../win/X11/dialogs.c ../win/X11/winX.c \
../win/X11/winmisc.c ../win/X11/winstat.c ../win/X11/wintext.c \
../win/X11/winval.c ../win/X11/winlabel.c \
../win/share/tileset.c ../win/share/bmptiles.c ../win/share/giftiles.c \
$(GENTILECFILE)
../win/share/pngtiles.c $(GENTILECFILE)
WINX11OBJ ?= $(TARGETPFX)Window.o $(TARGETPFX)dialogs.o $(TARGETPFX)winX.o \
$(TARGETPFX)winmap.o $(TARGETPFX)winmenu.o $(TARGETPFX)winmesg.o \
$(TARGETPFX)winmisc.o $(TARGETPFX)winstat.o $(TARGETPFX)wintext.o \
$(TARGETPFX)winval.o $(TARGETPFX)winlabel.o \
$(TARGETPFX)tileset.o $(TARGETPFX)bmptiles.o $(TARGETPFX)giftiles.o
$(TARGETPFX)tileset.o $(TARGETPFX)bmptiles.o $(TARGETPFX)giftiles.o \
$(TARGETPFX)pngtiles.o
#
# Files for a Qt 3 interface (renamed since nethack 3.6.x)
#
@@ -1113,6 +1114,9 @@ $(TARGETPFX)bmptiles.o: ../win/share/bmptiles.c $(CONFIG_H) \
$(TARGETPFX)giftiles.o: ../win/share/giftiles.c $(CONFIG_H) \
../include/objclass.h ../include/tileset.h
$(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/share/giftiles.c
$(TARGETPFX)pngtiles.o: ../win/share/pngtiles.c $(CONFIG_H) \
../include/objclass.h ../include/tileset.h
$(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/share/pngtiles.c
$(TARGETPFX)wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H)
$(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ ../win/chain/wc_chainin.c
$(TARGETPFX)wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H)
+5
View File
@@ -398,6 +398,7 @@ endif # MAKEFILE_SRC
ifdef WANT_WIN_X11
USE_XPM=1
USE_XFT=1
USE_PNG=1
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
ifndef CROSSCOMPILE
@@ -419,6 +420,10 @@ CFLAGS += -DUSE_XPM
WINX11LIB += -lXpm
VARDATND0 += rip.xpm
endif
ifdef USE_PNG
CFLAGS += -DUSE_PNG
WINX11LIB += -lpng
endif
WINLIB += $(WINX11LIB)
LFLAGS+=-L/opt/X11/lib
endif # WANT_WIN_X11
+5
View File
@@ -279,6 +279,7 @@ endif # WANT_WIN_CHAIN
ifdef WANT_WIN_X11
USE_XFT=1
USE_XPM=1
USE_PNG=1
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
GENTILEOFILE = $(SRCDIR)/tile.o
@@ -298,6 +299,10 @@ CFLAGS += -DUSE_XPM
WINX11LIB += -lXpm
VARDATND0 += rip.xpm
endif
ifdef USE_PNG
CFLAGS += -DUSE_PNG
WINX11LIB += -lpng
endif
WINLIB += $(WINX11LIB)
LFLAGS += -L/opt/X11/lib
endif # WANT_WIN_X11