components/games/nethack/patches/Makefile.src.patch

   1 diff -Nru NetHack-3.6.7.orig/sys/unix/Makefile.src NetHack-3.6.7/sys/unix/Makefile.src
   2 --- NetHack-3.6.7.orig/sys/unix/Makefile.src    2023-02-15 22:52:57.000000000 +0100
   3 +++ NetHack-3.6.7/sys/unix/Makefile.src 2023-10-08 15:27:22.300140002 +0200
   4 @@ -41,7 +41,7 @@
   5  # SHELL=E:/GEMINI2/MUPFEL.TTP
   6
   7  # Usually, the C compiler driver is used for linking:
   8 -#LINK=$(CC)
   9 +LINK=$(CC)
  10
  11  # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating
  12  # system.
  13 @@ -124,8 +124,8 @@
  14  # LFLAGS = -s
  15
  16  # flags for BSD/OS 2.0
  17 -# CFLAGS = -O -I../include -I/usr/X11/include
  18 -# LFLAGS = -L/usr/X11/lib
  19 +CFLAGS = -O -I../include -I/usr/X11/include
  20 +LFLAGS = -L/usr/X11/lib
  21
  22  # flags for Linux
  23  #   compile normally
  24 @@ -176,9 +176,9 @@
  25  # The Qt and Be window systems are written in C++, while the rest of
  26  # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
  27  # the C++ libraries linked in.
  28 -CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
  29 -CXX ?= g++
  30 -MOC ?= moc
  31 +#CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
  32 +#CXX ?= g++
  33 +#MOC ?= moc
  34  #LINK=g++
  35  #      For cross-compiling, eg. with gcc on Linux (see also CC further up):
  36  #CXX=arm-linux-g++
  37 @@ -267,8 +267,8 @@
  38  #WINBEOBJ = winbe.o NHWindow.o NHMenuWindow.o NHMapWindow.o tile.o
  39  #
  40  #
  41 -#WINSRC = $(WINTTYSRC)
  42 -#WINOBJ = $(WINTTYOBJ)
  43 +WINSRC = $(WINTTYSRC) $(WINX11SRC)
  44 +WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
  45  #
  46  # Curses - Karl Garrison, Tangles
  47  #WINSRC = $(WINCURSESSRC)
  48 @@ -287,12 +287,12 @@
  49  # WINTTYLIB = -ltermcap
  50  # WINTTYLIB = -lcurses
  51  # WINTTYLIB = -lcurses16
  52 -# WINTTYLIB = -lncurses
  53 +WINTTYLIB = -lncurses
  54  #WINTTYLIB = -ltermlib
  55  #
  56  # libraries for X11
  57  # If USE_XPM is defined in config.h, you will also need -lXpm here.
  58 -#WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
  59 +WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
  60  # WINX11LIB = -lXaw -lXmu -lXt -lX11
  61  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
  62  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
  63 @@ -327,7 +327,7 @@
  64  # same as above, for XCurses
  65  #WINCURSESLIB = -L/usr/local/lib/pdcurses -lXCurses -lXawM -lXmu -lXext -lXt -lX11
  66  #
  67 -#WINLIB = $(WINTTYLIB)
  68 +WINLIB = -Wl,-zignore $(WINTTYLIB) $(WINX11LIB)
  69  #
  70  # For Curses
  71  #WINLIB = $(WINCURSESLIB)