View | Details | Raw Unified | Return to bug 88206
Collapse All | Expand All

(-)noegnud-nethack/files/noegnud-nethack.patch (-2 / +2 lines)
Lines 64-70 Link Here
64 
 #   compile normally
 64 
 #   compile normally
65
65
66 
-COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include `sdl-config --cflags`
 66 
-COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include `sdl-config --cflags`
67 
+COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
 67 
+COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
68
68
69 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
 69 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
70 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
 70 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
Lines 73-79 Link Here
73 
+CFLAGS += $(STD_CFLAGS)
 73 
+CFLAGS += $(STD_CFLAGS)
74
74
75 
-LFLAGS = -L/usr/X11R6/lib
 75 
-LFLAGS = -L/usr/X11R6/lib
76 
+LFLAGS = -L/usr/X11R6/lib -lgnuregex
 76 
+LFLAGS = -L${X11BASE}/lib -lgnuregex
77
77
78 
 #   OR compile backwards compatible a.out format
 78 
 #   OR compile backwards compatible a.out format
79 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
 79 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
(-)noegnud-slashem/files/noegnud-slashem.patch (-14 / +19 lines)
Lines 1-6 Link Here
1 
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem-0.0.6E4F8/sys/unix/Makefile.src
 1 
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem-0.0.6E4F8/sys/unix/Makefile.src
2 
--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src	Sat Nov 20 21:50:19 2004
 2 
--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src	Sat Oct 29 18:45:35 2005
3 
+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.src	Sat Nov 20 21:53:09 2004
 3 
+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.src	Sat Oct 29 18:51:48 2005
4 
@@ -31,7 +31,7 @@
 4 
@@ -31,7 +31,7 @@
5 
 # For Systos users compiling on the ST, you'll either need a bourne shell
 5 
 # For Systos users compiling on the ST, you'll either need a bourne shell
6 
 # clone or you'll need to do make depend, etc. by hand. In either case,
 6 
 # clone or you'll need to do make depend, etc. by hand. In either case,
Lines 19-30 Link Here
19 
 #
 19 
 #
20 
 #	For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
 20 
 #	For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
21 
 #
 21 
 #
22 
@@ -118,12 +118,12 @@
 22 
@@ -118,14 +118,14 @@
23 
 # flags for Linux
 23 
 # flags for Linux
24 
 #   compile normally
 24 
 #   compile normally
25
25
26 
-COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include `sdl-config --cflags`
 26 
-COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include `sdl-config --cflags`
27 
+COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
 27 
+COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
28
28
29 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
 29 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
30 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
 30 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
Lines 32-39 Link Here
32 
-CFLAGS = $(STD_CFLAGS)
 32 
-CFLAGS = $(STD_CFLAGS)
33 
+CFLAGS += $(STD_CFLAGS)
 33 
+CFLAGS += $(STD_CFLAGS)
34
34
35 
 LFLAGS = -L/usr/X11R6/lib
 35 
-LFLAGS = -L/usr/X11R6/lib
36 
+LFLAGS = -L${X11BASE}/lib
36 
 #   OR compile backwards compatible a.out format
 37 
 #   OR compile backwards compatible a.out format
38 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
39 
 # LFLAGS = -b i486-linuxaout -L/usr/X11/lib
37 
@@ -176,9 +176,9 @@
 40 
@@ -176,9 +176,9 @@
38 
 # The Qt and Be window systems are written in C++, while the rest of
 41 
 # The Qt and Be window systems are written in C++, while the rest of
39 
 # NetHack is standard C.  If using Qt, uncomment the LD line here to get
 42 
 # NetHack is standard C.  If using Qt, uncomment the LD line here to get
Lines 59-66 Link Here
59 
 NOEGNUD = ../win/noegnud/noegnud
 62 
 NOEGNUD = ../win/noegnud/noegnud
60
63
61 
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top variants/slashem-0.0.6E4F8/sys/unix/Makefile.top
 64 
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top variants/slashem-0.0.6E4F8/sys/unix/Makefile.top
62 
--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top	Sat Nov 20 21:50:19 2004
 65 
--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top	Sat Oct 29 18:45:35 2005
63 
+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.top	Sat Nov 20 21:53:30 2004
 66 
+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.top	Sat Oct 29 18:46:03 2005
64 
@@ -14,7 +14,7 @@
 67 
@@ -14,7 +14,7 @@
65 
 # MAKE = make
 68 
 # MAKE = make
66
69
Lines 80-87 Link Here
80 
 FILE_AREA_VAR = $(VARDIR)
 83 
 FILE_AREA_VAR = $(VARDIR)
81 
 FILE_AREA_SAVE = $(VARDIR)/save
 84 
 FILE_AREA_SAVE = $(VARDIR)/save
82 
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl
 85 
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl
83 
--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl	Sat Nov 20 21:50:19 2004
 86 
--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl	Sat Oct 29 18:45:35 2005
84 
+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl	Sat Nov 20 21:54:19 2004
 87 
+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl	Sat Oct 29 18:51:52 2005
85 
@@ -15,7 +15,7 @@
 88 
@@ -15,7 +15,7 @@
86
89
87 
 # if you are using gcc as your compiler,
 90 
 # if you are using gcc as your compiler,
Lines 91-108 Link Here
91 
 #
 94 
 #
92 
 #	For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
 95 
 #	For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
93 
 #
 96 
 #
94 
@@ -72,7 +72,7 @@
 97 
@@ -72,8 +72,8 @@
95
98
96 
 # flags for Linux
 99 
 # flags for Linux
97 
 #   compile normally
 100 
 #   compile normally
98 
-CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
 101 
-CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
99 
+CFLAGS += -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
 102 
-LFLAGS = -L/usr/X11R6/lib
100 
 LFLAGS = -L/usr/X11R6/lib
 103 
+CFLAGS += -O2 -fomit-frame-pointer -I../include -I${X11BASE}/include
104 
+LFLAGS = -L${X11BASE}/lib
101 
 #   OR compile backwards compatible a.out format
 105 
 #   OR compile backwards compatible a.out format
102 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
 106 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
107 
 # LFLAGS = -b i486-linuxaout -L/usr/X11/lib
103 
diff -urN variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c variants/slashem-0.0.6E4F8/win/tty/termcap.c
 108 
diff -urN variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c variants/slashem-0.0.6E4F8/win/tty/termcap.c
104 
--- variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c	Sat Nov 20 23:11:00 2004
 109 
--- variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c	Sun Mar 31 16:06:19 2002
105 
+++ variants/slashem-0.0.6E4F8/win/tty/termcap.c	Sat Nov 20 23:11:19 2004
 110 
+++ variants/slashem-0.0.6E4F8/win/tty/termcap.c	Sat Oct 29 18:46:03 2005
106 
@@ -835,7 +835,7 @@
 111 
@@ -835,7 +835,7 @@
107
112
108 
 #include <curses.h>
 113 
 #include <curses.h>
(-)noegnud-littlehack/files/noegnud-littlehack.patch (-2 / +2 lines)
Lines 64-70 Link Here
64 
 #   compile normally
 64 
 #   compile normally
65
65
66 
-COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include `sdl-config --cflags`
 66 
-COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include `sdl-config --cflags`
67 
+COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
 67 
+COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
68
68
69 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
 69 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
70 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
 70 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
Lines 73-79 Link Here
73 
+CFLAGS += $(STD_CFLAGS)
 73 
+CFLAGS += $(STD_CFLAGS)
74
74
75 
-LFLAGS = -L/usr/X11R6/lib
 75 
-LFLAGS = -L/usr/X11R6/lib
76 
+LFLAGS = -L/usr/X11R6/lib -lgnuregex
 76 
+LFLAGS = -L${X11BASE}/lib -lgnuregex
77
77
78 
 #   OR compile backwards compatible a.out format
 78 
 #   OR compile backwards compatible a.out format
79 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
 79 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
(-)noegnud-nethack-deet/files/noegnud-nethack-deet.patch (-2 / +2 lines)
Lines 73-79 Link Here
73 
 #   compile normally
 73 
 #   compile normally
74
74
75 
-COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include `sdl-config --cflags`
 75 
-COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include `sdl-config --cflags`
76 
+COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
 76 
+COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
77
77
78 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
 78 
 STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
79 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
 79 
 DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
Lines 82-88 Link Here
82 
+CFLAGS += $(STD_CFLAGS)
 82 
+CFLAGS += $(STD_CFLAGS)
83
83
84 
-LFLAGS = -L/usr/X11R6/lib
 84 
-LFLAGS = -L/usr/X11R6/lib
85 
+LFLAGS = -L/usr/X11R6/lib -lgnuregex
 85 
+LFLAGS = -L${X11BASE}/lib -lgnuregex
86
86
87 
 #   OR compile backwards compatible a.out format
 87 
 #   OR compile backwards compatible a.out format
88 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
 88 
 # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include

Return to bug 88206