Attachment 15871 Details for Bug 29314 – file.diff

[patch] file.diff

file.diff (text/plain), 4.09 KB, created by jmcoopr on 2001-07-30 03:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jmcoopr

Created: 2001-07-30 03:20:00 UTC

Size: 4.09 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 29314: 15871