2005-09-11 08:26:02 -04:00
|
|
|
$OpenBSD: patch-sys_unix_Makefile_src,v 1.2 2005/09/11 12:26:02 espie Exp $
|
|
|
|
|
--- sys/unix/Makefile.src.orig Sat Jul 2 09:24:44 2005
|
|
|
|
|
+++ sys/unix/Makefile.src Sun Sep 11 13:53:12 2005
|
2001-07-04 07:14:53 -04:00
|
|
|
@@ -1,6 +1,7 @@
|
|
|
|
|
# NetHack Makefile.
|
2005-09-11 08:26:02 -04:00
|
|
|
# SCCS Id: @(#)Makefile.src 3.4 2002/03/02
|
2001-07-04 07:14:53 -04:00
|
|
|
|
|
|
|
|
+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
|
2005-09-11 08:26:02 -04:00
|
|
|
@@ -144,8 +145,7 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un
|
2001-07-04 07:14:53 -04:00
|
|
|
# flags for debugging:
|
|
|
|
|
# CFLAGS = -g -I../include
|
|
|
|
|
|
|
|
|
|
-CFLAGS = -O -I../include
|
|
|
|
|
-LFLAGS =
|
|
|
|
|
+CFLAGS += -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H -I../include
|
|
|
|
|
|
2005-09-11 08:26:02 -04:00
|
|
|
# Only used for the Gnome interface.
|
|
|
|
|
# When including the Gnome interface, you need to include gnome specific
|
|
|
|
|
@@ -291,8 +291,6 @@ WINGLOBJ = gl_conf.o gl_emul.o gl_font.o
|
|
|
|
|
SDLGL_CFLAGS = `sdl-config --cflags`
|
2001-07-04 07:14:53 -04:00
|
|
|
|
|
|
|
|
# Use these declarations if you only want to support the TTY windowing system
|
|
|
|
|
-WINSRC = $(WINTTYSRC)
|
|
|
|
|
-WINOBJ = $(WINTTYOBJ)
|
|
|
|
|
# Use these declarations if you want to support the X11 windowing system
|
|
|
|
|
# WINSRC = $(WINTTYSRC) $(WINX11SRC)
|
|
|
|
|
# WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
|
2005-09-11 08:26:02 -04:00
|
|
|
@@ -341,7 +339,7 @@ WINTTYLIB = -ltermlib
|
2001-07-04 07:14:53 -04:00
|
|
|
#
|
|
|
|
|
# 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
|
2005-09-11 08:26:02 -04:00
|
|
|
@@ -372,7 +370,6 @@ WINGLLIB = -lGL
|
|
|
|
|
WINPROXYLIB = -lpthread
|
2001-07-04 07:14:53 -04:00
|
|
|
|
|
|
|
|
# Use this declaration if you only want to support the TTY windowing system
|
|
|
|
|
-WINLIB = $(WINTTYLIB)
|
|
|
|
|
# Use this declaration if you want to support the X11 windowing system
|
|
|
|
|
# WINLIB = $(WINTTYLIB) $(WINX11LIB)
|
|
|
|
|
# Use this declaration if you want to support the Qt windowing system
|
2005-09-11 08:26:02 -04:00
|
|
|
@@ -601,13 +598,13 @@ objects.o:
|
2001-07-04 07:14:53 -04:00
|
|
|
|
|
|
|
|
# Qt windowport meta-object-compiler output
|
|
|
|
|
qt_kde0.moc: ../include/qt_kde0.h
|
2005-09-11 08:26:02 -04:00
|
|
|
- $(QTBINDIR)/moc -o qt_kde0.moc ../include/qt_kde0.h
|
|
|
|
|
+ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
|
2001-07-04 07:14:53 -04:00
|
|
|
|
|
|
|
|
qt_win.moc: ../include/qt_win.h
|
2005-09-11 08:26:02 -04:00
|
|
|
- $(QTBINDIR)/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
|
2001-07-04 07:14:53 -04:00
|
|
|
|
|
|
|
|
# NetHack windows library for modules needed by more than one windows
|
|
|
|
|
# interface.
|
