summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Make-config351
-rw-r--r--Makefile.X1117
-rw-r--r--progs/demos/Makefile.X115
-rw-r--r--progs/redbook/Makefile.X114
-rw-r--r--progs/samples/Makefile.X119
-rw-r--r--progs/xdemos/Makefile.X114
6 files changed, 199 insertions, 191 deletions
diff --git a/Make-config b/Make-config
index d78739bc74..35a90ad3ac 100644
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.19 2000/02/11 20:44:00 brianp Exp $
+# $Id: Make-config,v 1.20 2000/02/16 01:09:06 brianp Exp $
MESA_MAJOR=3
MESA_MINOR=3
@@ -29,13 +29,19 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
# The following variables are passed to each Makefile:
#
-# GL_LIB the name of the Mesa "GL" library file (usually libGL.a)
-# GLU_LIB the name of the Mesa "GLU" library file (usually libGLU.a)
-# GLUT_LIB the name of the GLUT library file (usually libglut.a)
-# CC the C compiler (usually cc or gcc)
-# CFLAGS flags to C compiler (usually -O)
-# MAKELIB the script or command to make a library file
-# XLIBS libraries needed to link X apps (at least -lX11)
+# GL_LIB the name of the Mesa "GL" library file (usually libGL.so)
+# GLU_LIB the name of the Mesa "GLU" library file (usually libGLU.so)
+# GLUT_LIB the name of the GLUT library file (usually libglut.so)
+# GLW_LIB the name of the GLw widget library file (usually libGLw.so)
+# CC the C compiler (usually cc or gcc)
+# CFLAGS flags to C compiler (usually -O)
+# MAKELIB the script or command to make a library file
+# GL_LIB_DEPS list of libraries which the GL library depends on
+# GLU_LIB_DEPS list of libraries which the GLU library depends on
+# GLUT_LIB_DEPS list of libraries which the GLUT library depends on
+# APP_LIB_DEPS list of libraries which demo programs depend upon
+# ASM_SOURCES optional list of assembly language files to assemble
+#
#
# Optionally, you can add definitions for the INCDIR and LIBDIR variables
# which specify where to find the Mesa include files and where to put the
@@ -43,18 +49,15 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
# overriding makefile macros on the command line should work with most
# variants of make.
#
-# To enable profiling add -DPROFILE to the CFLAGS line. Be sure to set the
-# MESA_PROFILE environment variable to enable printing of the profile report.
-#
# If your system supports the X Shared Memory extension add -DUSE_XSHM to the
-# CFLAGS line and add -lXext to the XLIBS line.
+# CFLAGS line and add -lXext to the GL_LIB_DEPS line.
#
# Some compilers complain about const parameters. Adding -DNO_CONST to the
# CFLAGS line should silence suth warnings.
#
#
# To add a new system configuration just follow the examples below and update
-# the top-level Makefile.
+# the top-level Makefile.X11 file.
@@ -67,7 +70,7 @@ aix:
"CC = cc" \
"CFLAGS = -O -DAIXV3" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
aix-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -78,7 +81,7 @@ aix-sl:
"CC = cc" \
"CFLAGS = -O -DAIXV3" \
"MAKELIB = ../bin/mklib.aix" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
# Make-config additions for the Amiga 3000 UX
# Carlyn Voss Iuzzolino 5/8/95:
@@ -96,7 +99,7 @@ amix:
"CC = cc" \
"CFLAGS =" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lsocket -lnsl -lm"
+ "APP_LIB_DEPS = -lX11 -lsocket -lnsl -lm"
beos-r4:
$(MAKE) -f Makefile.BeOS-R4 targets \
@@ -107,7 +110,7 @@ beos-r4:
"CC = g++" \
"CFLAGS = -O -DNO_CONST" \
"MAKELIB = ../bin/mklib.beos-r4" \
- "XLIBS = "
+ "APP_LIB_DEPS = "
bsdos:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -118,7 +121,7 @@ bsdos:
"CC = gcc" \
"CFLAGS = -I/usr/X11/include -O2" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11/lib -lX11 -lipc -lm"
+ "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lipc -lm"
bsdos4:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -129,7 +132,7 @@ bsdos4:
"CC = gcc" \
"CFLAGS = -I/usr/X11/include -O2 -fPIC" \
"MAKELIB = ../bin/mklib.bsdos4" \
- "XLIBS = -L/usr/X11/lib -lX11 -lipc -lm"
+ "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lipc -lm"
cygnus:
$(MAKE) -f Makefile.cygnus $(MFLAGS) -f Makefile.X11 targets \
@@ -174,7 +177,7 @@ dgux:
"CC = gcc" \
"CFLAGS = -O" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lm"
+ "APP_LIB_DEPS = -lX11 -lm"
freebsd:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -185,7 +188,7 @@ freebsd:
"CC = gcc" \
"CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
"MAKELIB = ../bin/mklib.freebsd" \
- "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
freebsd-386:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -196,7 +199,7 @@ freebsd-386:
"CC = gcc" \
"CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
"MAKELIB = ../bin/mklib.freebsd" \
- "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S"
gcc:
@@ -208,7 +211,7 @@ gcc:
"CC = gcc" \
"CFLAGS = -pedantic -O2" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lm"
+ "APP_LIB_DEPS = -lX11 -lm"
hpux9:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -219,7 +222,7 @@ hpux9:
"CC = cc" \
"CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
hpux9-gcc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -230,7 +233,7 @@ hpux9-gcc:
"CC = gcc" \
"CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
hpux9-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -241,7 +244,7 @@ hpux9-sl:
"CC = cc" \
"CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.hpux" \
- "XLIBS = -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm"
hpux9-gcc-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -252,7 +255,7 @@ hpux9-gcc-sl:
"CC = gcc" \
"CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.hpux" \
- "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
hpux10:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -263,7 +266,7 @@ hpux10:
"CC = cc" \
"CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
hpux10-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -274,7 +277,7 @@ hpux10-sl:
"CC = cc" \
"CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.hpux" \
- "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
hpux10-gcc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -285,7 +288,7 @@ hpux10-gcc:
"CC = gcc" \
"CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
hpux10-gcc-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -296,7 +299,7 @@ hpux10-gcc-sl:
"CC = gcc" \
"CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.hpux" \
- "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
# For IRIX 4: don't use -fullwarn because it causes too much garbage
@@ -309,7 +312,7 @@ irix4:
"CC = cc" \
"CFLAGS = -O2 -ansi -prototypes -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -lXext -lXmu -lXi -lX11 -lm"
# On IRIX 5.3 -sopt causes a problem in drawpixels.c so we don't use it
irix5:
@@ -321,7 +324,7 @@ irix5:
"CC = cc" \
"CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
# On IRIX 5.2+gcc
irix5-gcc:
@@ -333,7 +336,7 @@ irix5-gcc:
"CC = gcc" \
"CFLAGS = -O2 -pedantic -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
# IRIX 5 using Dynamic Shared Objects (DSO)
irix5-dso:
@@ -345,7 +348,7 @@ irix5-dso:
"CC = cc" \
"CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \
"MAKELIB = ../bin/mklib.irix5" \
- "XLIBS = -rpath ../lib -lX11 -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -rpath ../lib -lX11 -lXmu -lXi -lm"
irix6-o32:
pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -356,7 +359,7 @@ irix6-o32:
"CC = cc" \
"CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
irix6-o32-dso:
pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -367,7 +370,7 @@ irix6-o32-dso:
"CC = cc" \
"CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \
"MAKELIB = ../bin/mklib.irix6-32" \
- "XLIBS = -rpath ../lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -rpath ../lib -lX11 -lXext -lXmu -lXi -lm"
# For IRIX 6: -woff:
# 1209 - controlling expression is constant
@@ -381,7 +384,7 @@ irix6-n32:
"CC = cc" \
"CFLAGS = -n32 -mips3 -O3 -ansi -woff 1209,1521" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
irix6-n32-dso:
pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -393,7 +396,7 @@ irix6-n32-dso:
"CC = cc" \
"CFLAGS = -n32 -mips3 -O3 -ansi -DUSE_XSHM -woff 1185,1521" \
"MAKELIB = ../bin/mklib.irix6-n32" \
- "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe -lm"
+ "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe -lm"
irix6-gcc-n32-sl:
make $(MFLAGS) -f Makefile.X11 targets \
@@ -405,7 +408,7 @@ irix6-gcc-n32-sl:
"CC = gcc" \
"CFLAGS = -mabi=n32 -mips3 -O3 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.irix6-n32" \
- "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXmu -lXi -lm"
# For IRIX 6-64: -woff:
# 1068 - integer conversion resulted in a change of sign
@@ -425,7 +428,7 @@ irix6-64:
"CC = cc" \
"CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
irix6-64-dso:
pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -437,7 +440,7 @@ irix6-64-dso:
"CC = cc" \
"CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.irix6-64" \
- "XLIBS = -rpath ../lib64 -lX11 -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -rpath ../lib64 -lX11 -lXmu -lXi -lm"
linux:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -446,9 +449,12 @@ linux:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc" \
- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm"
linux-static:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -457,9 +463,9 @@ linux-static:
"GLUT_LIB = libglut.a" \
"GLW_LIB = libGLw.a" \
"CC = gcc" \
- "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+ "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm -lpthread"
linux-386:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -468,9 +474,12 @@ linux-386:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc" \
- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -I/usr/X11R6/include -DPTHREADS" \
+ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm -lpthread" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm"
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
linux-386-static:
@@ -480,9 +489,9 @@ linux-386-static:
"GLUT_LIB = libglut.a" \
"GLW_LIB = libGLw.a" \
"CC = gcc" \
- "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -I/usr/X11R6/include" \
+ "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm -lpthread" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
linux-glide:
@@ -492,9 +501,12 @@ linux-glide:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc" \
- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
+ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm"
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide2x" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lglut -lGLU -lGL"
linux-386-glide:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -503,9 +515,12 @@ linux-386-glide:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc" \
- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
+ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
linux-386-opt-V2-glide:
@@ -515,9 +530,12 @@ linux-386-opt-V2-glide:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc" \
- "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DFX_V2 -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\
+ "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DFX_V2 -DUSE_X86_ASM -DPTHREAD -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
linux-386-opt-glide:
@@ -527,9 +545,12 @@ linux-386-opt-glide:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc" \
- "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
+ "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DUSE_X86_ASM -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
linux-3dnow:
@@ -539,9 +560,12 @@ linux-3dnow:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
- "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/X11R6/include" \
+ "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
X86/mmx_blend.S \
X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
@@ -557,9 +581,12 @@ linux-3dnow-glide:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
+ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
X86/mmx_blend.S \
X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
@@ -576,9 +603,12 @@ linux-katmai:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
- "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -I/usr/X11R6/include" \
+ "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
X86/mmx_blend.S \
X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
@@ -600,9 +630,12 @@ linux-katmai-glide:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
- "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
+ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
X86/mmx_blend.S \
X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
@@ -628,7 +661,7 @@ linux-ggi:
"CC = gcc" \
"CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DGGI -DCDECL=" \
"MAKELIB = ../bin/mklib.ggi" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm"
# Contributed by Emmanuel marty core@ggi-project.org
linux-386-ggi:
@@ -640,23 +673,11 @@ linux-386-ggi:
"CC = gcc" \
"CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \
"MAKELIB = ../bin/mklib.ggi" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi -lm" \
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
-# Linux on Alpha (based on email from John Ferguson ferguson@viz.tamu.edu)
linux-alpha:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
- "GL_LIB = libGL.a" \
- "GLU_LIB = libGLU.a" \
- "GLUT_LIB = libglut.so" \
- "GLW_LIB = libGLw.a" \
- "CC = gcc" \
- "CFLAGS = -O2 -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DUSE_XSHM" \
- "MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lm"
-
-linux-alpha-elf:
- $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
"GL_LIB = libGL.so" \
"GLU_LIB = libGLU.so" \
"GLUT_LIB = libglut.so" \
@@ -664,26 +685,23 @@ linux-alpha-elf:
"CC = gcc" \
"CFLAGS = -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm"
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm"
-# Not tested, but should be okay on any RedHat-based linux for PowerPC machines
-# If your linux supports shared libraries, you might want to build with the
-# the "linux-ppc-shared" entry instead
-# You might want to change the mcpu flag appropriately for your
-# processor (601, 603, 604, etc.), it but doesn't make much difference
-linux-ppc:
+linux-alpha-static:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
"GL_LIB = libGL.a" \
"GLU_LIB = libGLU.a" \
- "GLUT_LIB = libglut.a" \
+ "GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.a" \
"CC = gcc" \
- "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
+ "CFLAGS = -O2 -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lm"
-# -O5 and -fexpensive-optimizations causes a compiler crash for Linux PPC R4
-linux-ppc-so:
+linux-ppc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
"GL_LIB = libGL.so" \
"GLU_LIB = libGLU.so" \
@@ -692,34 +710,23 @@ linux-ppc-so:
"CC = gcc" \
"CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
-
-# Contributed by John Gotts
-linux-386-pthread:
- $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
- "GL_LIB = libGL.so" \
- "GLU_LIB = libGLU.so" \
- "GLUT_LIB = libglut.so" \
- "CC = gcc" \
- "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/us\r/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DPTHREADS" \
- "MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread -lm" \
- "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm"
-# Contributed by C. Alex. North-Keys (erlkonig@talisman.org)
-linux-386-pthread-glide:
+linux-ppc-static:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
- "GL_LIB = libGL.so" \
- "GLU_LIB = libGLU.so" \
- "GLUT_LIB = libglut.so" \
+ "GL_LIB = libGL.a" \
+ "GLU_LIB = libGLU.a" \
+ "GLUT_LIB = libglut.a" \
+ "GLW_LIB = libGLw.a" \
"CC = gcc" \
- "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DPTHREADS -DFX -I/usr/include/glide -I/usr/local/glide/include" \
- "MAKELIB = ../bin/mklib.glide" \
- "XLIBS = -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread -lm" \
- "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
- X86/mmx_blend.S X86/vertex.S"
+ "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
+ "MAKELIB = ../bin/mklib.ar-ruv" \
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm"
-linux-sparc:
+linux-sparc-static:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
"GL_LIB = libGL.a" \
"GLU_LIB = libGLU.a" \
@@ -728,10 +735,10 @@ linux-sparc:
"CC = gcc" \
"CFLAGS = -pedantic -funroll-loops -O3 -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXt -lSM -lICE -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXt -lXmu -lXi -lm"
# Replace -mv8 with -mcypress, -msupersparc or -msparclite as appropriate.
-linux-sparc5-elf:
+linux-sparc5:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
"GL_LIB = libGL.so" \
"GLU_LIB = libGLU.so" \
@@ -740,7 +747,10 @@ linux-sparc5-elf:
"CC = gcc" \
"CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm"
# 32-bit Sparc ELF userland, on UltraSparc
linux-sparc-ultra:
@@ -752,13 +762,15 @@ linux-sparc-ultra:
"CC = gcc" \
"CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lm"
# May want to add these CFLAGS for better performance under LynxOS and GCC:
# -fPIC -O2 -ansi -pedantic -mieee-fp -DUSE_XSHM -funroll-loops
# -fexpensive-optimizations -fomit-frame-pointer -ffast-math
# and -malign-loops=2 -malign-jumps=2 -malign-functions=2 for Pentium
-
lynxos:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
"GL_LIB = libGL.a" \
@@ -768,7 +780,7 @@ lynxos:
"CC = gcc" \
"CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd -lm"
+ "APP_LIB_DEPS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd -lm"
machten-2.2:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -779,7 +791,7 @@ machten-2.2:
"CC = gcc" \
"CFLAGS = -DTENON -D__MACHTEN__ -fstrength-reduce -m68881 -O2" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -L/usr/lib/X11 -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11 -lX11 -lm"
machten-4.0:
$(MAKE) targets \
@@ -790,7 +802,7 @@ machten-4.0:
"CC = gcc" \
"CFLAGS = -DTENON -D__MACHTEN__ -fstrength-reduce -O2" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -L/usr/X11R5/lib -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/X11R5/lib -lX11 -lm"
mklinux:
$(MAKE) targets \
@@ -801,7 +813,7 @@ mklinux:
"CC = gcc" \
"CFLAGS = -pedantic -O2" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
+ "APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
netbsd:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -812,7 +824,7 @@ netbsd:
"CC = gcc" \
"CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100" \
"MAKELIB = ../bin/mklib.netbsd" \
- "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
next:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -832,7 +844,7 @@ openbsd:
"CC = cc" \
"CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
"MAKELIB = ../bin/mklib.openbsd" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm"
openstep:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -861,7 +873,7 @@ os2-x11:
"CC = gcc" \
"CFLAGS = -Zmt -O3 -m486 -funroll-loops -Wall -Wno-unused -ansi -pedantic -ffast-math -DUSE_X86_ASM -D_SVID_SOURCE -D_BSD_SOURCE -I$(X11ROOT)/XFree86/include" \
"MAKELIB = ..\\bin\\mklib-emx.cmd " \
- "XLIBS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \
+ "APP_LIB_DEPS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
osf1:
@@ -873,7 +885,7 @@ osf1:
"CC = cc" \
"CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DNO_CONST" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
osf1-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -884,7 +896,7 @@ osf1-sl:
"CC = cc" \
"CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DNO_CONST" \
"MAKELIB = ../bin/mklib.osf1" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
pgi-cygnus:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -895,7 +907,7 @@ pgi-cygnus:
"CC = pgcc" \
"CFLAGS = -fast -cyglibs -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lm"
+ "APP_LIB_DEPS = -lX11 -lm"
pgi-mingw32:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -906,7 +918,7 @@ pgi-mingw32:
"CC = pgcc" \
"CFLAGS = -fast -msvcrt -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lm"
+ "APP_LIB_DEPS = -lX11 -lm"
# QNX V4 & Watcom Compiler
qnx:
@@ -918,7 +930,7 @@ qnx:
"CC = cc" \
"CFLAGS = -O" \
"MAKELIB = ../bin/mklib.qnx" \
- "XLIBS = -L/usr/X11/lib -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm"
sco:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -929,7 +941,7 @@ sco:
"CC = gcc" \
"CFLAGS = -pedantic -O2 -mieee-fp" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11/lib -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm"
sco5:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -940,7 +952,7 @@ sco5:
"CC = gcc" \
"CFLAGS = -pedantic -O2 -mieee-fp" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lXm -lXt -lX11 -lXmu -lXext -lsocket -lx -lm"
+ "APP_LIB_DEPS = -lXm -lXt -lX11 -lXmu -lXext -lsocket -lx -lm"
solaris-x86:
$(MAKE) -f Makefile.X11 targets \
@@ -951,7 +963,7 @@ solaris-x86:
"CC = cc" \
"CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.solaris" \
- "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
solaris-x86-gcc:
$(MAKE) -f Makefile.X11 targets \
@@ -962,7 +974,7 @@ solaris-x86-gcc:
"CC = gcc" \
"CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.solaris" \
- "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos4:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -973,7 +985,7 @@ sunos4:
"CC = acc" \
"CFLAGS = -O -DUSE_XSHM -DSUNOS4" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
sunos4-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -984,7 +996,7 @@ sunos4-sl:
"CC = acc" \
"CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4" \
"MAKELIB = ld -assert pure-text -o" \
- "XLIBS = -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm"
sunos4-gcc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -995,7 +1007,7 @@ sunos4-gcc:
"CC = gcc" \
"CFLAGS = -O3 -DUSE_XSHM -DSUNOS4 -I/usr/openwin/include" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos4-gcc-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1006,7 +1018,7 @@ sunos4-gcc-sl:
"CC = gcc" \
"CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.sunos4" \
- "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos4-gcc-x11r6-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1017,7 +1029,7 @@ sunos4-gcc-x11r6-sl:
"CC = gcc" \
"CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.sunos4" \
- "XLIBS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi -lm"
sunos5:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1028,7 +1040,7 @@ sunos5:
"CC = cc" \
"CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos5-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1039,7 +1051,7 @@ sunos5-sl:
"CC = cc" \
"CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.sunos5" \
- "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos5-ultra:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1050,7 +1062,7 @@ sunos5-ultra:
"CC = cc" \
"CFLAGS = -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos5-ultra-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1061,7 +1073,7 @@ sunos5-ultra-sl:
"CC = cc" \
"CFLAGS = -KPIC -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.sunos5" \
- "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos5-gcc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1072,7 +1084,7 @@ sunos5-gcc:
"CC = gcc" \
"CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos5-gcc-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1083,7 +1095,7 @@ sunos5-gcc-sl:
"CC = gcc" \
"CFLAGS = -fPIC -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.sunos5" \
- "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
sunos5-x11r6-gcc-sl:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1094,7 +1106,7 @@ sunos5-x11r6-gcc-sl:
"CC = gcc" \
"CFLAGS = -fPIC -O3 -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.sunos5" \
- "XLIBS = -lSM -lICE -lX11 -lXext -lXmu -lXi -lnsl -lsocket -lm"
+ "APP_LIB_DEPS = -lSM -lICE -lX11 -lXext -lXmu -lXi -lnsl -lsocket -lm"
# Contributed by John Stone
sunos5-pthread:
@@ -1105,7 +1117,7 @@ sunos5-pthread:
"CC = cc" \
"CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4\_BUG -DPTHREADS" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
# Contributed by John Stone
sunos5-thread:
@@ -1116,7 +1128,7 @@ sunos5-thread:
"CC = cc" \
"CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4\_BUG -DSOLARIS_THREADS" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
# Contributed by John Stone
sunos5-gcc-thread:
@@ -1127,7 +1139,7 @@ sunos5-gcc-thread:
"CC = gcc" \
"CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DSOLARIS_THREADS" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
# Contributed by John Stone
sunos5-gcc-pthread:
@@ -1138,7 +1150,7 @@ sunos5-gcc-pthread:
"CC = gcc" \
"CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DPTHREADS" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
# from Ron Metoyer (metoyer@iexist.flw.lucent.com)
sunSolaris-CC:
@@ -1150,7 +1162,7 @@ sunSolaris-CC:
"CC = CC" \
"CFLAGS = -O -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
#This config doesn't work, Ultrix C compiler isn't ANSI compliant
ultrix:
@@ -1162,7 +1174,7 @@ ultrix:
"CC = cc" \
"CFLAGS = -O -Dconst=/**/" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lXmu -lX11 -lXi -lm"
+ "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm"
ultrix-gcc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1173,7 +1185,7 @@ ultrix-gcc:
"CC = gcc" \
"CFLAGS = -pedantic -O2" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lXmu -lX11 -lXi -lm"
+ "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm"
# tested on Cray C90 running UNICOS 8.0.4
unicos:
@@ -1185,7 +1197,7 @@ unicos:
"CC = cc" \
"CFLAGS =" \
"MAKELIB = ../bin/mklib/ar-rcv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
unixware:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1196,7 +1208,7 @@ unixware:
"CC = cc" \
"CFLAGS = -O -I/usr/X/include -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
unixware-shared:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1207,7 +1219,7 @@ unixware-shared:
"CC = cc" \
"CFLAGS = -O -I/usr/X/include -KPIC,inline -DUSE_XSHM" \
"MAKELIB = ../bin/mklib.solaris" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
uwin:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1217,7 +1229,7 @@ uwin:
"CC = gcc" \
"CFLAGS = -pedantic -O2 -I/usr/X11/include " \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/X11/lib -lX11 -lm"
+ "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lm"
vistra:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1228,7 +1240,7 @@ vistra:
"CC = gcc" \
"CFLAGS = -pedantic -O2" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -lX11 -lsocket -lnsl -lgen -lm"
+ "APP_LIB_DEPS = -lX11 -lsocket -lnsl -lgen -lm"
# for debugging on IRIX 5.x systems
@@ -1247,7 +1259,7 @@ irix-debug:
"CC = cc" \
"CFLAGS = -g -n32 -ansi -fullwarn -DUSE_XSHM -DDEBUG -woff 1209,1210,1506,1521,3496" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm"
+ "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm"
DEBUG:
pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -1258,7 +1270,7 @@ DEBUG:
"CC = cc" \
"CFLAGS = -g -ansi -prototypes -fullwarn -DUSE_XSHM -DDEBUG" \
"MAKELIB = ../bin/mklib.ar-rcv" \
- "XLIBS = -lX11 -lXext -lXmu -lXi -lfpe -lm"
+ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lfpe -lm"
# for debugging on Linux systems
linux-static-debug:
@@ -1270,7 +1282,7 @@ linux-static-debug:
"CC = gcc" \
"CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -DUSE_XSHM -DDEBUG -DSVGA -DFX -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM_not -I/usr/include/glide -I/usr/local/glide/include" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/local/glide/lib -lglide2x -ltexus -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm" \
+ "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -ltexus -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
linux-elf-debug:
@@ -1280,9 +1292,12 @@ linux-elf-debug:
"GLUT_LIB = libglut.so" \
"GLW_LIB = libGLw.so" \
"CC = gcc" \
- "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DSVGA" \
+ "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DSVGA -I/usr/include/glide -DFX" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm -lpthread -lvga"
+ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lvga -L/usr/local/glide/lib -lglide2x" \
+ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
+ "APP_LIB_DEPS = -lglut -lGLU -lGL"
linux-glide-debug:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1293,7 +1308,7 @@ linux-glide-debug:
"CC = gcc" \
"CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \
"MAKELIB = ../bin/mklib.linux" \
- "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm -lpthread"
+ "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm -lpthread"
# for profiling on Linux systems
linux-prof:
@@ -1305,7 +1320,7 @@ linux-prof:
"CC = gcc" \
"CFLAGS = -O2 -pg -ansi -pedantic -Wall -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/include/glide -I/usr/local/glide/include" \
"MAKELIB = ../bin/mklib.ar-ruv" \
- "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+ "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
"ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
X86/mmx_blend.S \
X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
diff --git a/Makefile.X11 b/Makefile.X11
index f8d68b212b..616490f64c 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.18 2000/02/10 16:00:36 brianp Exp $
+# $Id: Makefile.X11,v 1.19 2000/02/16 01:09:06 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.3
@@ -72,10 +72,6 @@ default:
@echo " make linux-386-static for Linux on Intel, make static .a libs"
@echo " make linux-ggi for Linux systems with libggi"
@echo " make linux-386-ggi for Linux systems with libggi w/ Intel assembly"
- @echo " make linux-alpha for Linux on Alpha systems"
- @echo " make linux-alpha-elf for Linux on Alpha systems, make ELF shared libs"
- @echo " make linux-ppc for Linux on PowerPC systems"
- @echo " make linux-ppc-so for Linux on PowerPC systems, make shared libs"
@echo " make linux-glide for Linux w/ 3Dfx Glide driver"
@echo " make linux-386-glide for Linux w/ 3Dfx Glide driver, Intel assembly"
@echo " make linux-386-opt-glide for Linux with 3Dfx Voodoo1 for GLQuake"
@@ -84,8 +80,10 @@ default:
@echo " make linux-3dnow-glide for Linux on AMD w/ 3DNow! for Glide"
@echo " make linux-katmai for Linux on PentiumIII w/ SSE"
@echo " make linux-katmai-glide for Linux on PentiumIII w/ SSE for Glide"
- @echo " make linux-386-pthread for Linux on Intel, thread safety"
- @echo " make linux-386-pthread-glide for Linux on Intel, thread safety, Glide"
+ @echo " make linux-alpha for Linux on Alpha systems"
+ @echo " make linux-alpha-static for Linux on Alpha systems, static libs"
+ @echo " make linux-ppc for Linux on PowerPC systems"
+ @echo " make linux-ppc-static for Linux on PowerPC systems, static libs"
@echo " make linux-sparc for Linux on Sparc systems"
@echo " make linux-sparc5-elf for Sparc5 systems, make ELF shared libs"
@echo " make linux-sparc-ultra for UltraSparc systems, make ELF shared libs"
@@ -148,9 +146,8 @@ linux-glide linux-386-glide linux-386-opt-glide \
linux-386-opt-V2-glide \
linux-3dnow linux-3dnow-glide \
linux-katmai linux-katmai-glide \
-linux-alpha linux-alpha-elf \
-linux-ppc linux-ppc-so \
-linux-386-pthread linux-386-pthread-glide \
+linux-alpha-static linux-alpha \
+linux-ppc-static linux-ppc \
linux-sparc \
linux-sparc5-elf \
linux-sparc-ultra \
diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index 3a19563358..3fe75a36ff 100644
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -1,10 +1,9 @@
-# $Id: Makefile.X11,v 1.4 2000/01/28 16:27:27 brianp Exp $
+# $Id: Makefile.X11,v 1.5 2000/02/16 01:09:06 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.3
# Copyright (C) 1995-2000 Brian Paul
-
# Makefile for GLUT-based demo programs for Unix/X11
@@ -13,7 +12,7 @@
INCDIR = ../include
LIBDIR = ../lib
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
diff --git a/progs/redbook/Makefile.X11 b/progs/redbook/Makefile.X11
index d08d794b38..4446132d93 100644
--- a/progs/redbook/Makefile.X11
+++ b/progs/redbook/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.2 1999/10/27 10:09:53 brianp Exp $
+# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.1
@@ -12,7 +12,7 @@
INCDIR = ../include
LIBDIR = ../lib
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
diff --git a/progs/samples/Makefile.X11 b/progs/samples/Makefile.X11
index 72acbcbb58..dd0c5e53eb 100644
--- a/progs/samples/Makefile.X11
+++ b/progs/samples/Makefile.X11
@@ -1,20 +1,18 @@
-# $Id: Makefile.X11,v 1.2 1999/10/27 10:09:53 brianp Exp $
+# $Id: Makefile.X11,v 1.3 2000/02/16 01:09:06 brianp Exp $
# Mesa 3-D graphics library
-# Version: 3.1
+# Version: 3.3
# Copyright (C) 1995-1999 Brian Paul
-
# Makefile for assorted SGI OpenGL demos
-
##### MACROS #####
INCDIR = ../include
LIBDIR = ../lib
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
@@ -23,7 +21,6 @@ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
shape sphere star stencil stretch texture tri wave
-
##### RULES #####
.SUFFIXES:
diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11
index 19dba9bb9d..115991c4b5 100644
--- a/progs/xdemos/Makefile.X11
+++ b/progs/xdemos/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.6 1999/11/25 17:42:01 brianp Exp $
+# $Id: Makefile.X11,v 1.7 2000/02/16 01:09:06 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.3
@@ -12,7 +12,7 @@
INCDIR = ../include
LIBDIR = ../lib
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 21:43:08 +0000