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

update sys/unix/hints/macosx10.10

Browse Source 
On OSX, one of the XQuartz header files triggers a compiler warning
about using a gcc extension, resulting in a diagnostic for each of
the files compiled with the WANT_WIN_X11 set of CFLAGS.  Use the
same fix as hints/macosx10.8 already does.
This commit is contained in:
PatR
2016-07-30 01:59:27 -07:00
parent 6632c380f3
commit 5e0cf04b04
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sys/unix/hints/macosx10.10
View File

@@ -5,11 +5,15 @@
# #
#-PRE #-PRE
# Mac OS X (Darwin) hints file # Mac OS X (Darwin) hints file
# This is for Mac OS X 10.10 or later. If this doesn't work for some other # This is for Mac OS X 10.10 or later, and has been tested on 10.11
# (El Capitan). If this doesn't work for some other
# version of Mac OS X, make a new file for that OS, don't change this one. # version of Mac OS X, make a new file for that OS, don't change this one.
# And let us know about it. # And let us know about it.
# Useful info: http://www.opensource.apple.com/darwinsource/index.html # Useful info: http://www.opensource.apple.com/darwinsource/index.html
# You'll need to obtain and install XQuartz if you want X11 support.
# (Attempting to run X11.app will describe where to get it.)
# This hints file can build several different types of installations. # This hints file can build several different types of installations.
# Edit the next section to match the type of build you need. # Edit the next section to match the type of build you need.
@@ -100,6 +104,8 @@ LFLAGS=-L/opt/X11/lib
VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir); POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
CFLAGS += -DX11_GRAPHICS -I/opt/X11/include CFLAGS += -DX11_GRAPHICS -I/opt/X11/include
# avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
CFLAGS += -Wno-variadic-macros
endif # WANT_WIN_X11 endif # WANT_WIN_X11
ifdef WANT_WIN_QT ifdef WANT_WIN_QT