Lines 1-5
Link Here
|
1 |
--- Makefile.orig Tue May 2 10:57:07 2000 |
1 |
--- Makefile.orig Tue May 2 03:57:07 2000 |
2 |
+++ Makefile Wed Jan 10 04:45:14 2001 |
2 |
+++ Makefile Thu Jan 10 19:33:45 2002 |
3 |
@@ -1,19 +1,19 @@ |
3 |
@@ -1,19 +1,19 @@ |
4 |
# Makefile for Linux Heretic/GLHeretic |
4 |
# Makefile for Linux Heretic/GLHeretic |
5 |
|
5 |
|
Lines 37-43
Link Here
|
37 |
COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H |
37 |
COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H |
38 |
|
38 |
|
39 |
-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__ |
39 |
-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__ |
40 |
+COPT.FreeBSD = -D__32BIT__ -DHOMEDIR="\"${PREFIX}/share/heretic\"" |
40 |
+COPT.FreeBSD = -D__32BIT__ -DHOMEDIR='"\"${PREFIX}/share/heretic\""' |
41 |
|
41 |
|
42 |
COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \ |
42 |
COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \ |
43 |
-DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\) |
43 |
-DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\) |
Lines 53-70
Link Here
|
53 |
-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \ |
53 |
-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \ |
54 |
- -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) |
54 |
- -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) |
55 |
+CFLAGS += $(CDEFS.udp) $(COPT.arch) \ |
55 |
+CFLAGS += $(CDEFS.udp) $(COPT.arch) \ |
56 |
+ -I. -I.. -I${X11BASE}/include $(COPT.sound) $(COPT.opengl) |
56 |
+ -I. -I.. -I${X11BASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl) |
57 |
|
57 |
|
58 |
# Uncomment the line below if you want to use original "[" and "]" keys |
58 |
# Uncomment the line below if you want to use original "[" and "]" keys |
59 |
# for inventory access, instead of "k" and "l". |
59 |
# for inventory access, instead of "k" and "l". |
60 |
@@ -85,12 +85,12 @@ |
60 |
@@ -85,18 +85,18 @@ |
61 |
COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND |
61 |
COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND |
62 |
X11LIBS = -lXext -lX11 |
62 |
X11LIBS = -lXext -lX11 |
63 |
|
63 |
|
64 |
-MUSSERV = musserver |
64 |
-MUSSERV = musserver |
65 |
-SNDSERV = sndserver |
|
|
66 |
+#MUSSERV = musserver |
65 |
+#MUSSERV = musserver |
67 |
+#SNDSERV = sndserver |
66 |
SNDSERV = sndserver |
68 |
|
67 |
|
69 |
endif |
68 |
endif |
70 |
|
69 |
|
Lines 73-78
Link Here
|
73 |
|
72 |
|
74 |
X11LIBS = -lXext -lX11 |
73 |
X11LIBS = -lXext -lX11 |
75 |
GLLIBS = -lSDL -lpthread |
74 |
GLLIBS = -lSDL -lpthread |
|
|
75 |
GGILIBS = -lggi -lm |
76 |
VGALIBS = -lvga |
77 |
-SDLLIBS = -lSDL -lpthread |
78 |
+SDLLIBS = -L${LOCALBASE}/lib -lSDL ${PTHREAD_LIBS} |
79 |
|
80 |
OBJS = am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \ |
81 |
p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \ |
76 |
@@ -104,7 +104,7 @@ |
82 |
@@ -104,7 +104,7 @@ |
77 |
p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \ |
83 |
p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \ |
78 |
r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \ |
84 |
r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \ |