Merge branch 'x11-bmp-gif' of https://github.com/chasonr/NetHack into NetHack-5.0
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user