macOS generated tile build fix
This commit is contained in:
@@ -282,7 +282,9 @@ USE_XPM=1
|
|||||||
USE_PNG=1
|
USE_PNG=1
|
||||||
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
|
WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
|
||||||
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
|
VARDATND0 += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
|
||||||
|
ifndef CROSSCOMPILE
|
||||||
GENTILEOFILE = $(SRCDIR)/tile.o
|
GENTILEOFILE = $(SRCDIR)/tile.o
|
||||||
|
endif
|
||||||
# -x: if built without dodlb, some versions of mkfontdir think *.lev are fonts
|
# -x: if built without dodlb, some versions of mkfontdir think *.lev are fonts
|
||||||
POSTINSTALL += bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
|
POSTINSTALL += bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
|
||||||
# separate from CFLAGS so that we don't pass it to every file
|
# separate from CFLAGS so that we don't pass it to every file
|
||||||
@@ -310,6 +312,9 @@ endif # WANT_WIN_X11
|
|||||||
ifdef WANT_WIN_QT
|
ifdef WANT_WIN_QT
|
||||||
LINK = $(CXX)
|
LINK = $(CXX)
|
||||||
ifdef WANT_WIN_QT5
|
ifdef WANT_WIN_QT5
|
||||||
|
ifndef CROSSCOMPILE
|
||||||
|
GENTILEOFILE = $(SRCDIR)/tile.o
|
||||||
|
endif
|
||||||
# Qt5 requires C++11
|
# Qt5 requires C++11
|
||||||
QTCXXFLAGS += $(sort $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig \
|
QTCXXFLAGS += $(sort $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig \
|
||||||
pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --cflags))
|
pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --cflags))
|
||||||
|
|||||||
Reference in New Issue
Block a user