summaryrefslogtreecommitdiff
path: root/games/bzflag/patches/patch-ae
blob: 1ed4395a87bf48ab6e99e94eadb988accd8aa8f3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
$NetBSD: patch-ae,v 1.4 2004/06/07 02:29:07 snj Exp $

--- src/bzflag/Makefile.in.orig	2004-06-03 17:38:21.000000000 -0700
+++ src/bzflag/Makefile.in	2004-06-03 17:41:42.000000000 -0700
@@ -179,7 +179,6 @@ bzflag_SOURCES = \
 @MACOS_TRUE@	../scene/libSceneDB.a		\
 @MACOS_TRUE@	../geometry/libGeometry.a	\
 @MACOS_TRUE@	../mediafile/libMediaFile.a	\
-@MACOS_TRUE@	../zlib/libz.a			\
 @MACOS_TRUE@	$(REGEX)			\
 @MACOS_TRUE@	$(RESOURCE)			\
 @MACOS_TRUE@	$(GLIBS)
@@ -193,7 +192,6 @@ bzflag_SOURCES = \
 @MACOS_FALSE@	../scene/libSceneDB.a		\
 @MACOS_FALSE@	../geometry/libGeometry.a	\
 @MACOS_FALSE@	../mediafile/libMediaFile.a	\
-@MACOS_FALSE@	../zlib/libz.a			\
 @MACOS_FALSE@	$(REGEX)			\
 @MACOS_FALSE@	$(RESOURCE)			\
 @MACOS_FALSE@	$(GLIBS)
@@ -203,7 +201,7 @@ bzflag_SOURCES = \
 #	$(ALIBS)
 AM_CPPFLAGS = $(X_CFLAGS)
 
-bzflag_LDFLAGS = ../date/buildDate.o
+bzflag_LDFLAGS = ../date/buildDate.o -lz ${LIBOSSAUDIO}
 subdir = src/bzflag
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
@@ -235,7 +233,6 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@	../scene/libSceneDB.a \
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@	../geometry/libGeometry.a \
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@	../zlib/libz.a \
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_TRUE@	bzflag.res
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@bzflag_DEPENDENCIES = \
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@	../net/libNet.a \
@@ -246,7 +243,6 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@	../scene/libSceneDB.a \
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@	../geometry/libGeometry.a \
 @BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_FALSE@@MACOS_FALSE@@WIN32_FALSE@	../zlib/libz.a
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@bzflag_DEPENDENCIES = \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@	../net/libNet.a \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@	../common/libCommon.a \
@@ -257,7 +253,6 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@	../scene/libSceneDB.a \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@	../geometry/libGeometry.a \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@	../zlib/libz.a \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_TRUE@	bzflag.res
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@bzflag_DEPENDENCIES = \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@	../net/libNet.a \
@@ -268,8 +263,7 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@	../ogl/libGLKit.a \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@	../scene/libSceneDB.a \
 @BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@	../geometry/libGeometry.a \
-@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@	../zlib/libz.a
+@BUILD_REGEX_FALSE@@MACOS_TRUE@@WIN32_FALSE@	../mediafile/libMediaFile.a
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@bzflag_DEPENDENCIES = \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	../net/libNet.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	../common/libCommon.a \
@@ -279,7 +273,6 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	../scene/libSceneDB.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	../geometry/libGeometry.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	../zlib/libz.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	../regex/libregex.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_TRUE@	bzflag.res
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@bzflag_DEPENDENCIES = \
@@ -291,7 +284,6 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@	../scene/libSceneDB.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@	../geometry/libGeometry.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@	../zlib/libz.a \
 @BUILD_REGEX_TRUE@@MACOS_FALSE@@WIN32_FALSE@	../regex/libregex.a
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@bzflag_DEPENDENCIES = \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@	../net/libNet.a \
@@ -303,7 +295,6 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@	../scene/libSceneDB.a \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@	../geometry/libGeometry.a \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@	../zlib/libz.a \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@	../regex/libregex.a \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_TRUE@	bzflag.res
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@bzflag_DEPENDENCIES = \
@@ -316,7 +307,6 @@ bzflag_LDADD = $(LDADD)
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@	../scene/libSceneDB.a \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@	../geometry/libGeometry.a \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@	../mediafile/libMediaFile.a \
-@BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@	../zlib/libz.a \
 @BUILD_REGEX_TRUE@@MACOS_TRUE@@WIN32_FALSE@	../regex/libregex.a
 
 DEFS = @DEFS@