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

recent changes caused a compile issue with QT

Browse Source 
On a machine with both homebrew and macports, the presence of
macports was causing the homebrew Qt settings to be overwritten
right after they were set. Check to see if QTDIR is already
defined before proceeding with QT macports.
This commit is contained in:
nhmall
2022-06-15 22:22:15 -04:00
parent ef0620eadd
commit ab169d7961
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys/unix/hints/macOS.370
View File

@@ -63,6 +63,7 @@ ifdef WANT_WIN_QT6
QTDIR :=$(shell brew --prefix)/opt/qt@6 QTDIR :=$(shell brew --prefix)/opt/qt@6
endif # WANT_WIN_QT6 endif # WANT_WIN_QT6
endif # HAVE_HOMEBREW endif # HAVE_HOMEBREW
ifndef QTDIR
ifeq "$(HAVE_MACPORTS)" "1" ifeq "$(HAVE_MACPORTS)" "1"
ifdef WANT_WIN_QT5 ifdef WANT_WIN_QT5
# Qt5 installed via macports # Qt5 installed via macports
@@ -72,6 +73,7 @@ ifdef WANT_WIN_QT6
QTDIR=/opt/local/libexec/qt6 QTDIR=/opt/local/libexec/qt6
endif # WANT_WIN_QT6 endif # WANT_WIN_QT6
endif # HAVE_MACPORTS endif # HAVE_MACPORTS
endif # QTDIR
endif # WANT_WIN_QT endif # WANT_WIN_QT
ifndef LIBXPM ifndef LIBXPM