Lines 1-39
Link Here
|
1 |
--- Makefile.orig Fri Oct 17 16:11:10 1997 |
1 |
--- Makefile.orig Sat Nov 11 20:50:16 2000 |
2 |
+++ Makefile Sun Jun 7 18:26:02 1998 |
2 |
+++ Makefile Wed Nov 22 21:16:35 2000 |
3 |
@@ -1,7 +1,7 @@ |
3 |
@@ -1,26 +1,26 @@ |
4 |
|
4 |
#Define your C compiler. I recommend gcc if you have it. |
5 |
# Define your c compiler. I recommend gcc if you've got it. |
|
|
6 |
#CC = cc |
7 |
-CC = gcc |
5 |
-CC = gcc |
8 |
+#CC = gcc |
6 |
+#CC = gcc |
|
|
7 |
#CC = cc |
9 |
|
8 |
|
10 |
# Define your optimization flags. Most compilers understand -O and -O2, |
9 |
# Define your optimization flags. Most compilers understand -O and -O2, |
11 |
# Debugging (don't use) |
10 |
# Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.) |
12 |
@@ -43,7 +43,8 @@ |
11 |
-OPTS = -O2 |
13 |
# have that option. |
12 |
+#OPTS = -O2 |
14 |
# |
13 |
# Pentium with gcc 2.7.0 or better |
15 |
#DEFS = -DUSE_GETOPT_H -DCOLOR_SUPPORT -DEMACS_EDITING |
14 |
#OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \ |
16 |
-DEFS = |
15 |
#-malign-jumps=2 |
17 |
+DEFS = -DCOLOR_SUPPORT -DEMACS_EDITING -DUSE_NCURSES_H -DUSE_NOTHING \ |
16 |
|
18 |
+ -DUSE_UNISTD_H |
17 |
# Define where you want Frotz to be installed. Usually this is /usr/local |
19 |
|
18 |
-PREFIX = /usr/local |
20 |
# This should point to the location of your curses or ncurses include file |
19 |
+#PREFIX = /usr/local |
21 |
# if it's in a non-standard place. |
20 |
#PREFIX = |
22 |
@@ -57,7 +58,7 @@ |
21 |
|
23 |
#CURSES = -lncurses |
22 |
# Define where you want Frotz to look for frotz.conf. |
|
|
23 |
-CONFIG_DIR = /usr/local/etc |
24 |
+CONFIG_DIR = ${PREFIX}/etc |
25 |
#CONFIG_DIR = /etc |
26 |
#CONFIG_DIR = /usr/pkg/etc |
27 |
#CONFIG_DIR = |
28 |
|
29 |
# Uncomment this if you want color support. Usually this requires ncurses. |
30 |
-#COLOR_DEFS = -DCOLOR_SUPPORT |
31 |
+COLOR_DEFS = -DCOLOR_SUPPORT |
32 |
|
33 |
# Uncomment this if you have an OSS soundcard driver and want classical |
34 |
# Infocom sound support. |
35 |
@@ -28,7 +28,7 @@ |
36 |
|
37 |
# This should point to the location of your curses.h or ncurses.h include |
38 |
# file if your compiler doesn't know about it. |
39 |
-INCL = -I/usr/local/include |
40 |
+#INCL = -I/usr/local/include |
41 |
#INCL = -I/usr/pkg/include |
42 |
#INCL = -I/usr/freeware/include |
43 |
#INCL = -I/5usr/include |
44 |
@@ -37,7 +37,7 @@ |
45 |
# This should define the location and name of whatever curses library you're |
46 |
# linking with. Usually, this isn't necessary if /etc/ld.so.conf is set |
47 |
# up correctly. |
48 |
-LIB = -L/usr/local/lib |
49 |
+#LIB = -L/usr/local/lib |
50 |
#LIB = -L/usr/pkg/lib |
51 |
#LIB = -L/usr/freeware/lib |
24 |
#LIB = -L/5usr/lib |
52 |
#LIB = -L/5usr/lib |
25 |
LIB = |
53 |
@@ -81,7 +81,7 @@ |
26 |
-CURSES = -lcurses |
54 |
COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \ |
27 |
+CURSES = -lncurses |
55 |
$(MEMMOVE_DEF) |
28 |
|
|
|
29 |
# Nothing under this line should need to be changed. |
30 |
|
56 |
|
31 |
@@ -66,7 +67,7 @@ |
57 |
-CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL) |
32 |
text.o ux_init.o ux_input.o ux_pic.o ux_screen.o ux_sample.o \ |
58 |
+CFLAGS += $(OPTS) $(COMP_DEFS) $(INCL) |
33 |
ux_text.o variable.o |
|
|
34 |
|
59 |
|
35 |
-CFLAGS = $(OPTS) $(DEFS) $(INCL) |
|
|
36 |
+CFLAGS+= $(DEFS) |
37 |
|
60 |
|
38 |
frotz: $(OBJECTS) |
61 |
$(BINNAME): soundcard.h $(OBJECTS) |
39 |
$(CC) -o frotz $(OBJECTS) $(LIB) $(CURSES) |
|
|