2000-02-07 00:38:55 +00:00
|
|
|
--- Makefile.orig Tue Oct 13 09:16:35 1998
|
|
|
|
|
+++ Makefile Sun Feb 6 16:36:08 2000
|
1999-01-11 13:40:13 +00:00
|
|
|
@@ -5,8 +5,8 @@
|
1998-12-17 14:34:50 +00:00
|
|
|
#--------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
# Where you want to have it installed
|
|
|
|
|
-BINDIR = /usr/X11/bin
|
|
|
|
|
-MANDIR = /usr/X11/man/man1
|
|
|
|
|
+BINDIR = /usr/X11R6/bin
|
|
|
|
|
+MANDIR = /usr/X11R6/man/man1
|
|
|
|
|
|
|
|
|
|
# Use these for Mesa
|
1999-01-11 13:40:13 +00:00
|
|
|
#GL = -lglut -lMesaGLU -lMesaGL
|
2000-02-07 00:38:55 +00:00
|
|
|
@@ -15,11 +15,14 @@
|
|
|
|
|
GL = -lglut -lGLU -lGL
|
1998-12-17 14:34:50 +00:00
|
|
|
|
|
|
|
|
# Use these for gcc on Linux (may work in other systems as well)
|
2000-02-07 00:38:55 +00:00
|
|
|
-CC = gcc
|
1998-12-17 14:34:50 +00:00
|
|
|
-CFLAGS = -O3 -fomit-frame-pointer -ffast-math -Wall -Wno-implicit-int
|
2000-02-07 00:38:55 +00:00
|
|
|
-LD = gcc
|
|
|
|
|
+CC ?= gcc
|
|
|
|
|
+CFLAGS ?= -pipe -O2 -fexpensive-optimizations -ffast-math -fomit-frame-pointer \
|
|
|
|
|
+ -fforce-mem -fforce-addr
|
|
|
|
|
+CFLAGS += -Wall -Wno-implicit-int -I/usr/X11R6/include \
|
1998-12-17 14:34:50 +00:00
|
|
|
+ -I/usr/local/include
|
2000-02-07 00:38:55 +00:00
|
|
|
+LD = $(CC)
|
1998-12-17 14:34:50 +00:00
|
|
|
LDFLAGS = -o $@
|
|
|
|
|
-LIBS = -L/usr/X11/lib -L/usr/local/lib $(GL) -lX11 -lXext -lXmu -lXi -lm
|
|
|
|
|
+LIBS = -Wl,-rpath,/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL) -lX11 -lXext -lXmu -lXi -lm
|
|
|
|
|
|
|
|
|
|
# Use these for cc on IRIX (submitted by Andrew Dalke <dalke@bioreason.com>)
|
|
|
|
|
#CC = cc
|
