| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485 |
- $OpenBSD: patch-sys_unix_Makefile_src,v 1.10 2017/03/04 12:42:04 espie Exp $
- --- sys/unix/Makefile.src.orig Mon Dec 8 00:39:13 2003
- +++ sys/unix/Makefile.src Sat Mar 4 13:30:02 2017
- @@ -1,6 +1,7 @@
- # NetHack Makefile.
- # SCCS Id: @(#)Makefile.src 3.4 2002/03/02
-
- +include ${NETHACKCONFIG}
- # newer makes predefine $(MAKE) to 'make' and do smarter processing of
- # recursive make calls if $(MAKE) is used
- # these makes allow $(MAKE) to be overridden by the environment if someone
- @@ -151,14 +152,13 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs
- # flags for debugging:
- # CFLAGS = -g -I../include
-
- -CFLAGS = -O -I../include
- -LFLAGS =
- +CFLAGS += -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H -I../include
-
- # The Qt and Be window systems are written in C++, while the rest of
- # NetHack is standard C. If using Qt, uncomment the LINK line here to get
- # the C++ libraries linked in.
- CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
- -CXX=g++
- +CXX=c++
- #LINK=g++
- # For cross-compiling, eg. with gcc on Linux (see also CC further up):
- #CXX=arm-linux-g++
- @@ -214,8 +214,6 @@ WINBEOBJ =
-
- #
- #
- -WINSRC = $(WINTTYSRC)
- -WINOBJ = $(WINTTYOBJ)
-
- # on some systems the termcap library is in -ltermcap or -lcurses
- # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
- @@ -235,7 +233,7 @@ WINTTYLIB = -ltermlib
- #
- # libraries for X11
- # If USE_XPM is defined in config.h, you will also need -lXpm here.
- -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
- +WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
- # WINX11LIB = -lXaw -lXmu -lXt -lX11
- # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
- # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
- @@ -255,8 +253,6 @@ WINGEMLIB = -le_gem -lgem
- # libraries for BeOS
- WINBELIB = -lbe
-
- -WINLIB = $(WINTTYLIB)
- -
- # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)
- #
- @@ -392,7 +388,7 @@ $(GAME): $(SYSTEM)
-
- Sysunix: $(HOBJ) Makefile
- @echo "Loading ..."
- - $(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
- + @$(LINKCMD) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
- @touch Sysunix
-
- Sys3B2: $(HOBJ) Makefile
- @@ -459,15 +455,16 @@ objects.o:
- $(CC) $(CFLAGS) -c objects.c
- @rm -f $(MAKEDEFS)
-
- +MOC=moc
- # Qt windowport meta-object-compiler output
- qt_kde0.moc: ../include/qt_kde0.h
- - $(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
- + ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
-
- qt_win.moc: ../include/qt_win.h
- - $(QTDIR)/bin/moc -o qt_win.moc ../include/qt_win.h
- + ${MOC} -o qt_win.moc ../include/qt_win.h
-
- qttableview.moc: ../include/qttableview.h
- - $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
- + ${MOC} -o qttableview.moc ../include/qttableview.h
-
- $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
- ../include/objclass.h ../include/monsym.h \
|
