diff -ru nethack-3.4.2-orig/include/config.h nethack-3.4.2/include/config.h --- nethack-3.4.2-orig/include/config.h Sat Aug 30 02:07:15 2003 +++ nethack-3.4.2/include/config.h Wed Nov 5 14:11:50 2003 @@ -44,7 +44,7 @@ */ #define TTY_GRAPHICS /* good old tty based graphics */ /* #define X11_GRAPHICS */ /* X11 interface */ -/* #define QT_GRAPHICS */ /* Qt interface */ +#define QT_GRAPHICS /* Qt interface */ /* #define GNOME_GRAPHICS */ /* Gnome interface */ /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */ @@ -84,8 +84,8 @@ #ifdef QT_GRAPHICS # define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */ -# define USER_SOUNDS /* Use sounds */ -# define USER_SOUNDS_REGEX +/*# define USER_SOUNDS * Use sounds */ +/*# define USER_SOUNDS_REGEX */ # define USE_XPM /* Use XPM format for images (required) */ # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */ # ifndef DEFAULT_WINDOW_SYS @@ -141,10 +141,10 @@ #ifndef WIZARD /* allow for compile-time or Makefile changes */ # ifndef KR1ED -# define WIZARD "wizard" /* the person allowed to use the -D option */ +# define WIZARD "traykovs" /* the person allowed to use the -D option */ # else # define WIZARD -# define WIZARD_NAME "wizard" +# define WIZARD_NAME "traykovs" # endif #endif diff -ru nethack-3.4.2-orig/sys/unix/Makefile.src nethack-3.4.2/sys/unix/Makefile.src --- nethack-3.4.2-orig/sys/unix/Makefile.src Sat Aug 30 02:08:04 2003 +++ nethack-3.4.2/sys/unix/Makefile.src Wed Nov 5 14:12:14 2003 @@ -36,8 +36,15 @@ # SHELL=E:/GEMINI2/MUPFEL.TTP # Normally, the C compiler driver is used for linking: -LINK=$(CC) +CC=gcc +LINK=g++ +CFLAGS = -O -I../include +LFLAGS = -Wl,-rpath,$(QTDIR)/lib + +CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include +CXX=g++ + # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating # system. # @@ -151,15 +158,10 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = # 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++ -#LINK=g++ # For cross-compiling, eg. with gcc on Linux (see also CC further up): #CXX=arm-linux-g++ #LINK=arm-linux-gcc @@ -214,8 +216,8 @@ # # -WINSRC = $(WINTTYSRC) -WINOBJ = $(WINTTYOBJ) +WINSRC = $(WINTTYSRC) $(WINQTSRC) +WINOBJ = $(WINTTYOBJ) $(WINQTOBJ) # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead @@ -230,8 +232,8 @@ # WINTTYLIB = -ltermcap # WINTTYLIB = -lcurses # WINTTYLIB = -lcurses16 -# WINTTYLIB = -lncurses -WINTTYLIB = -ltermlib +WINTTYLIB = -lncurses +# WINTTYLIB = -ltermlib # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. @@ -241,7 +243,7 @@ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 # # libraries for Qt -WINQTLIB = -L$(QTDIR)/lib -lqt +WINQTLIB = -L$(QTDIR)/lib -lqt-mt # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext @@ -255,7 +257,7 @@ # libraries for BeOS WINBELIB = -lbe -WINLIB = $(WINTTYLIB) +WINLIB = $(WINTTYLIB) $(WINQTLIB) # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) diff -ru nethack-3.4.2-orig/sys/unix/Makefile.top nethack-3.4.2/sys/unix/Makefile.top --- nethack-3.4.2-orig/sys/unix/Makefile.top Sat Aug 30 02:08:04 2003 +++ nethack-3.4.2/sys/unix/Makefile.top Wed Nov 5 14:12:26 2003 @@ -14,15 +14,15 @@ # MAKE = make # make NetHack -PREFIX = /usr +PREFIX = /usr/stud/traykovs/home_sun/nethack_tst GAME = nethack # GAME = nethack.prg -GAMEUID = games -GAMEGRP = bin +GAMEUID = traykovs +GAMEGRP = tumuser # Permissions - some places use setgid instead of setuid, for instance # See also the option "SECURE" in include/config.h -GAMEPERM = 04755 +GAMEPERM = 0755 FILEPERM = 0644 EXEPERM = 0755 DIRPERM = 0755 @@ -40,7 +40,7 @@ SHELLDIR = $(PREFIX)/games # per discussion in Install.X11 and Install.Qt -VARDATND = +VARDATND = x11tiles rip.xpm nhsplash.xpm # VARDATND = x11tiles NetHack.ad pet_mark.xbm # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm # for Atari/Gem @@ -64,8 +64,8 @@ # other permission-related reasons. If that happens, you may want to set the # command to "true", which is a no-op. Note that disabling chown or chgrp # will only work if setuid (or setgid) behavior is not desired or required. -CHOWN = chown -CHGRP = chgrp +CHOWN = true +CHGRP = true # # end of configuration