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

(-)battleball.new/files/patch-Makefile (+39 lines)
Line 0 Link Here
1
--- Makefile	Thu Sep  2 19:25:18 1999
2
+++ Makefile.new	Sun Jul 29 19:08:13 2001
3
@@ -1,17 +1,18 @@
4
-CXX		= g++
5
+CXX		?= c++
6
 
7
 # If you don't have OpenGL or Mesa, you can still compile BattleBall;
8
 # just define the symbol NO_OPENGL when compiling, and don't link with
9
 # $(GLLIBS) when linking
10
-CXXFLAGS	= -O2 -funroll-loops
11
+CXXFLAGS	?= -O -pipe
12
 #CXXFLAGS	= -O2 -funroll-loops -DNO_OPENGL
13
 
14
 INCS		= -Ibsp -Ilib3d
15
-XLIBS		= -L/usr/X11R6/lib -lX11
16
+X11BASE		?=/usr/X11R6
17
+XLIBS		= -L$(X11BASE)/lib -lX11
18
 LIBS		= -lm $(XLIBS)
19
 
20
-GLINCS		= -I/usr/local/X11/include
21
-GLLIBS		= -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL
22
+GLINCS		= -I$(X11BASE)/include
23
+GLLIBS		= -lXi -lXmu -lXext -L$(X11BASE)/lib -lGL
24
 #GLLIBS		=
25
 
26
 BSPOBJS		= bsp/brep.o bsp/bsp.o bsp/polygon.o
27
@@ -25,10 +26,10 @@
28
 
29
 
30
 .C.o:
31
-	$(CXX) -c $(CXXFLAGS) $(INCS) $(GLINCS) -o $@ $<
32
+	$(CXX) -c $(CXXFLAGS) $(INCS) $(GLINCS) -pthread -o $@ $<
33
 
34
 battleball: $(OBJS)
35
-	$(CXX) */*.o -o battleball $(LIBS) $(GLLIBS)
36
+	$(CXX) */*.o -o battleball $(LIBS) $(GLLIBS) -pthread
37
 
38
 all:	battleball
39
 
(-)battleball.new/files/patch-ab (-22 lines)
Lines 1-22 Link Here
1
--- bb/main.C	Thu Sep  2 22:25:19 1999
2
+++ bb/main.C.new	Sun Apr 16 17:23:35 2000
3
@@ -11,6 +11,9 @@
4
 #include <stdio.h>       // to get sprintf()
5
 #include <string.h>      // to get strncpy()
6
 #include <time.h>        // to get time(time_t *)
7
+#if defined(__FreeBSD__) && !defined(__alpha__)
8
+#include <floatingpoint.h>
9
+#endif
10
 #include "bb.h"
11
 #include "bbgfxtarget.h"
12
 #include "player.h"
13
@@ -803,6 +806,9 @@
14
 /*=========================================================================*/
15
 // A long and complicated main() function!
16
 main (int argc, char *argv[]) {
17
+#if defined(__FreeBSD__) && !defined(__alpha__)
18
+  fpsetmask(0);
19
+#endif
20
   bb= new battleBall(argc,argv);
21
   bb->Play();
22
   delete bb;
(-)battleball.new/files/patch-af (-26 lines)
Lines 1-26 Link Here
1
--- Makefile	Thu Sep  2 22:25:18 1999
2
+++ Makefile.new	Sun Apr 16 17:28:19 2000
3
@@ -1,17 +1,18 @@
4
-CXX		= g++
5
+CXX		?= c++
6
 
7
 # If you don't have OpenGL or Mesa, you can still compile BattleBall;
8
 # just define the symbol NO_OPENGL when compiling, and don't link with
9
 # $(GLLIBS) when linking
10
-CXXFLAGS	= -O2 -funroll-loops
11
+CXXFLAGS	?= -O -pipe
12
 #CXXFLAGS	= -O2 -funroll-loops -DNO_OPENGL
13
 
14
 INCS		= -Ibsp -Ilib3d
15
-XLIBS		= -L/usr/X11R6/lib -lX11
16
+X11BASE		?=/usr/X11R6
17
+XLIBS		= -L$(X11BASE)/lib -lX11
18
 LIBS		= -lm $(XLIBS)
19
 
20
-GLINCS		= -I/usr/local/X11/include
21
-GLLIBS		= -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL
22
+GLINCS		= -I$(X11BASE)/include
23
+GLLIBS		= -lXi -lXmu -lXext -L$(X11BASE)/lib -lGL
24
 #GLLIBS		=
25
 
26
 BSPOBJS		= bsp/brep.o bsp/bsp.o bsp/polygon.o
(-)battleball.new/files/patch-bb::main.c (+22 lines)
Line 0 Link Here
1
--- bb/main.C	Thu Sep  2 22:25:19 1999
2
+++ bb/main.C.new	Sun Apr 16 17:23:35 2000
3
@@ -11,6 +11,9 @@
4
 #include <stdio.h>       // to get sprintf()
5
 #include <string.h>      // to get strncpy()
6
 #include <time.h>        // to get time(time_t *)
7
+#if defined(__FreeBSD__) && !defined(__alpha__)
8
+#include <floatingpoint.h>
9
+#endif
10
 #include "bb.h"
11
 #include "bbgfxtarget.h"
12
 #include "player.h"
13
@@ -803,6 +806,9 @@
14
 /*=========================================================================*/
15
 // A long and complicated main() function!
16
 main (int argc, char *argv[]) {
17
+#if defined(__FreeBSD__) && !defined(__alpha__)
18
+  fpsetmask(0);
19
+#endif
20
   bb= new battleBall(argc,argv);
21
   bb->Play();
22
   delete bb;

Return to bug 29314