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

qt6 support follow-up

Browse Source 
encompass Qt6 support in the common hints file macOS.2020 instead
of a separate macOS.2020-qt6, which had already diverged and would
likely be a maintenance headache.

From the Makefile perspective:
WANT_WIN_QT=1 will default to Qt5
WANT_WIN_QT5=1 will assume Qt5
WANT_WIN_QT6=1 will assume Qt6

You must have the appropriate Qt installed, of course.
I expect some additional fine-tuning will be needed as this gets
tried out.
This commit is contained in:
nhmall
2021-12-30 15:11:49 -05:00
parent 221e4a760d
commit b633bf46f9
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/hints/macOS.2020
+34 -4
View File
@@ -27,14 +27,36 @@ ifndef WANT_WIN_QT
ifdef WANT_WIN_ALL ifdef WANT_WIN_ALL
WANT_WIN_QT=1 WANT_WIN_QT=1
endif endif
endif ifdef WANT_WIN_QT5
ifndef WANT_WIN_QT
WANT_WIN_QT=1
endif # not WANT_WIN_QT
endif # WANT_WIN_QT5
ifdef WANT_WIN_QT6
ifndef WANT_WIN_QT
WANT_WIN_QT=1
endif # not WANT_WIN_QT
endif # WANT_WIN_QT6
endif # not WANT_WIN_QT
ifdef WANT_WIN_QT ifdef WANT_WIN_QT
ifndef WANT_WIN_QT5
ifndef WANT_WIN_QT6
WANT_WIN_QT5=1
endif # not WANT_WIN_QT6
endif # not WANT_WIN_QT5
#QTDIR=/Developer/Qt #QTDIR=/Developer/Qt
# Qt installed via homebrew ifdef WANT_WIN_QT5
# Qt5 installed via homebrew
QTDIR=$(shell brew --prefix)/opt/qt@5 QTDIR=$(shell brew --prefix)/opt/qt@5
# Qt installed via macports endif # WANT_WIN_QT5
ifdef WANT_WIN_QT6
QTDIR=$(shell brew --prefix)/opt/qt@6
endif # WANT_WIN_QT6
# Qt5 installed via macports
#QTDIR=/opt/local/libexec/qt5 #QTDIR=/opt/local/libexec/qt5
endif # WANT_WIN_QT endif # WANT_WIN_QT
ifndef LIBXPM ifndef LIBXPM
LIBXPM= -L/opt/X11/lib -lXpm LIBXPM= -L/opt/X11/lib -lXpm
endif endif
@@ -118,10 +140,18 @@ LFLAGS=-L/opt/X11/lib
endif # WANT_WIN_X11 endif # WANT_WIN_X11
ifdef WANT_WIN_QT ifdef WANT_WIN_QT
# Qt5 requires C++11
LINK = $(CXX) LINK = $(CXX)
ifdef WANT_WIN_QT5
# Qt5 requires C++11
QTCXXFLAGS += $(sort $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --cflags)) QTCXXFLAGS += $(sort $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --cflags))
WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs) WINLIB += $(shell PKG_CONFIG_PATH=$(QTDIR)/lib/pkgconfig pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs)
endif # WANT_WIN_QT5
ifdef WANT_WIN_QT6
QTCXXFLAGS += -std=c++17 -I $(QTDIR)/include -I $(QTDIR)/include/QtCore
MOC = moc
MOCPATH = $(QTDIR)/share/qt/libexec/moc
WINLIB += -F $(QTDIR)/Frameworks -framework QtCore -framework QtGui -framework QtWidgets
endif # WANT_WIN_QT6
WINSRC += $(WINQTSRC) WINSRC += $(WINQTSRC)
WINOBJ0 += $(WINQTOBJ) WINOBJ0 += $(WINQTOBJ)
VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm VARDATND0 += nhtiles.bmp rip.xpm nhsplash.xpm