upgrade to 3.6.2

[jnethack/source.git] / sys / unix / hints / macosx10.8

diff --git a/sys/unix/hints/macosx10.8 b/sys/unix/hints/macosx10.8
index d2c5034..87d0e83 100644 (file)
--- a/sys/unix/hints/macosx10.8
+++ b/sys/unix/hints/macosx10.8
@@ -1,5 +1,5 @@
 #
-# NetHack 3.6  macosx10.8 $NHDT-Date: 1455397109 2016/02/13 20:58:29 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.0 $
+# NetHack 3.6  macosx10.8 $NHDT-Date: 1546220385 2018/12/31 01:39:45 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.36 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -70,7 +70,7 @@ CC=gcc
 #
 
 #CFLAGS+=-W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
-CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic
+CFLAGS+=-Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -DGCC_WARN -ansi -pedantic -Wno-long-long
 # As of LLVM build 2336.1.00, this gives dozens of spurious messages, so
 # leave it out by default.
 #CFLAGS+=-Wunreachable-code
@@ -101,15 +101,23 @@ CFLAGS += -DNOTTYGRAPHICS
 endif  # !WANT_WIN_TTY
 
 ifdef WANT_WIN_X11
+WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
+# separate from CFLAGS so that we don't pass it to every file
+X11CFLAGS = -I/opt/X11/include
+CFLAGS += -DX11_GRAPHICS
+# avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
+X11CFLAGS += -Wno-variadic-macros
+ifdef USE_XPM
+CFLAGS += -DUSE_XPM
+WINX11LIB += -lXpm
+VARDATND += rip.xpm
+endif
 WINSRC += $(WINX11SRC)
 WINOBJ += $(WINX11OBJ)
 WINLIB += $(WINX11LIB)
 LFLAGS=-L/opt/X11/lib
-VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
-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
 
 ifdef WANT_WIN_QT