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

Merge branch 'x11-bmp-gif' of https://github.com/chasonr/NetHack into NetHack-5.0

Browse Source
This commit is contained in:
nhmall
2026-09-09 11:23:34 -04:00
parent 05d2e88950 d9194cb4df
commit 96c564f09d
9 changed files with 578 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/Makefile.src
+18 -2
View File
@@ -259,11 +259,15 @@ WINCURSESOBJ ?= $(TARGETPFX)cursmain.o $(TARGETPFX)curswins.o \
WINX11SRC ?= ../win/X11/Window.c ../win/X11/dialogs.c ../win/X11/winX.c \
../win/X11/winmap.c ../win/X11/winmenu.c ../win/X11/winmesg.c \
../win/X11/winmisc.c ../win/X11/winstat.c ../win/X11/wintext.c \
../win/X11/winval.c ../win/X11/winlabel.c $(GENTILECFILE)
../win/X11/winval.c ../win/X11/winlabel.c \
../win/share/tileset.c ../win/share/bmptiles.c ../win/share/giftiles.c \
../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)winval.o $(TARGETPFX)winlabel.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)
#
@@ -1103,6 +1107,18 @@ $(TARGETPFX)wintext.o: ../win/X11/wintext.c $(HACK_H) ../include/winX.h \
$(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/wintext.c
$(TARGETPFX)winval.o: ../win/X11/winval.c $(HACK_H) ../include/winX.h
$(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/X11/winval.c
$(TARGETPFX)tileset.o: ../win/share/tileset.c $(CONFIG_H) \
../include/objclass.h ../include/flag.h ../include/tileset.h
$(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/share/tileset.c
$(TARGETPFX)bmptiles.o: ../win/share/bmptiles.c $(CONFIG_H) \
../include/objclass.h ../include/tileset.h
$(TARGET_CC) $(TARGET_CFLAGS) $(X11CFLAGS) -c -o $@ ../win/share/bmptiles.c
$(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)
sys/unix/hints/linux.500
+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
sys/unix/hints/macOS.500
+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