-# $Id: Makefile.X11,v 1.25 2000/05/20 23:16:14 brianp Exp $
+# $Id: Makefile.X11,v 1.42 2001/03/17 00:45:01 brianp Exp $
# Mesa 3-D graphics library
-# Version: 3.3
+# Version: 3.5
#
# Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
#
@echo " make linux for Linux systems, make shared .so libs"
@echo " make linux-static for Linux systems, make static .a libs"
- @echo " make linux-386 for Linux on Intel, make shared .so libs"
- @echo " make linux-386-static for Linux on Intel, make static .a libs"
+ @echo " make linux-trace for Linux systems, with API trace extension"
+ @echo " make linux-x86 for Linux on Intel, make shared .so libs"
+ @echo " make linux-x86-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-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"
@echo " make linux-386-opt-V2-glide for Linux with 3Dfx Voodoo2 for GLQuake"
- @echo " make linux-3dnow for Linux on AMD w/ 3DNow!"
- @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-x86-glide for Linux w/ all x86 asm for 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"
+# XXX we may have to split up this group of targets into those that
+# have a C++ compiler and those that don't for the SI-GLU library.
+
aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
-linux-static-debug linux-elf-debug linux-prof linux-glide-debug \
-linux linux-static \
-linux-386 linux-386-static \
+linux linux-static linux-debug linux-static-debug linux-prof \
+linux-x86 linux-x86-static linux-x86-debug \
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-386-opt-V2-glide linux-x86-glide linux-glide-debug linux-glide-prof \
linux-alpha-static linux-alpha \
linux-ppc-static linux-ppc \
linux-sparc \
sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
-mkdir lib
if [ -d src ] ; then touch src/depend ; fi
- if [ -d src-glu ] ; then touch src-glu/depend ; fi
+ if [ -d si-glu ] ; then touch si-glu/depend ; fi
if [ -d src-glut ] ; then touch src-glut/depend ; fi
+ if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
- if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
+ if [ -d si-glu ] ; then cd si-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then touch src-glu/depend ; fi
if [ -d src-glut ] ; then touch src-glut/depend ; fi
if [ -d src-glut ] ; then touch src-glut/depend ; fi
+ if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
touch src/depend
touch src-glu/depend
if [ -d src-glut ] ; then touch src-glut/depend ; fi
+ if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
-mkdir lib
touch src/depend
touch src-glu/depend
+ if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
linux-ggi linux-386-ggi:
-mkdir lib
touch src/depend
- touch src-glu/depend
+ touch si-glu/depend
if [ -d src-glut ] ; then touch src-glut/depend ; fi
+ if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d ggi ] ; then touch ggi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/GGI/default ] ; then cd src/GGI/default ; $(MAKE) ; fi
if [ -d src/GGI/display ] ; then cd src/GGI/display ; $(MAKE) ; fi
- if [ -d src-glut ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
+ if [ -d si-glu ] ; then cd si-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
# if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d ggi ] ; then cd ggi ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d ggi ] ; then cd ggi/demos; $(MAKE) ; fi
-rm -f include/GL/*~
-rm -f src/*.o src/*~ src/*.a src/*/*.o src/*/*~
-rm -f src-glu/*.o src-glu/*~ src-glu/*.a
+ -rm -f si-glu/*/*.o si-glu/*/*/*.o
-rm -f src-glut/*.o
-rm -f demos/*.o
-rm -f book/*.o book/*~
-DIRECTORY = Mesa-3.3
-LIB_NAME = MesaLib-3.3beta1
-DEMO_NAME = MesaDemos-3.3beta1
-GLU_NAME = MesaGLU-3.3beta1
+DIRECTORY = Mesa-3.5
+LIB_NAME = MesaLib-3.5
+DEMO_NAME = MesaDemos-3.5
+GLU_NAME = MesaGLU-3.5
GLUT_NAME = GLUT-3.7
$(DIRECTORY)/missing \
$(DIRECTORY)/mkinstalldirs \
$(DIRECTORY)/stamp-h.in \
- $(DIRECTORY)/configure \
$(DIRECTORY)/docs/CONFIG \
$(DIRECTORY)/docs/CONFORM \
$(DIRECTORY)/docs/COPYING \
$(DIRECTORY)/docs/INSTALL.GNU \
$(DIRECTORY)/docs/README \
$(DIRECTORY)/docs/README.* \
- $(DIRECTORY)/docs/RELNOTES \
+ $(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/VERSIONS \
$(DIRECTORY)/docs/*.spec \
$(DIRECTORY)/bin/README \
$(DIRECTORY)/mesawin32.mak \
$(DIRECTORY)/Names.win \
$(DIRECTORY)/win32-openstep.sh \
- $(DIRECTORY)/*.dja \
+ $(DIRECTORY)/common.dja \
$(DIRECTORY)/include/GL/Makefile.in \
$(DIRECTORY)/include/GL/Makefile.am \
$(DIRECTORY)/include/GL/dosmesa.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/include/GL/glx.h \
$(DIRECTORY)/include/GL/glx_mangle.h \
+ $(DIRECTORY)/include/GL/mesa_wgl.h \
$(DIRECTORY)/include/GL/mglmesa.h \
$(DIRECTORY)/include/GL/osmesa.h \
$(DIRECTORY)/include/GL/svgamesa.h \
$(DIRECTORY)/src/*.def \
$(DIRECTORY)/src/depend \
$(DIRECTORY)/src/*.[chS] \
+ $(DIRECTORY)/src/math/*.[ch] \
+ $(DIRECTORY)/src/math/Makefile* \
+ $(DIRECTORY)/src/swrast/*.[ch] \
+ $(DIRECTORY)/src/swrast/Makefile* \
+ $(DIRECTORY)/src/swrast_setup/*.[ch] \
+ $(DIRECTORY)/src/swrast_setup/Makefile* \
+ $(DIRECTORY)/src/tnl/*.[ch] \
+ $(DIRECTORY)/src/tnl/Makefile* \
$(DIRECTORY)/src/Allegro/*.[ch] \
$(DIRECTORY)/src/BeOS/*.cpp \
$(DIRECTORY)/src/D3D/*.cpp \
$(DIRECTORY)/src/X86/*.[ch] \
$(DIRECTORY)/src/X86/Makefile.am \
$(DIRECTORY)/src/X86/Makefile.in \
- $(DIRECTORY)/src/X86/*.m4 \
$(DIRECTORY)/src/X86/*.S \
- $(DIRECTORY)/src/*.dja \
+ $(DIRECTORY)/si-glu/Makefile.X11 \
+ $(DIRECTORY)/si-glu/include/gluos.h \
+ $(DIRECTORY)/si-glu/libnurbs/interface/*.h \
+ $(DIRECTORY)/si-glu/libnurbs/interface/*.cc \
+ $(DIRECTORY)/si-glu/libnurbs/internals/*.h \
+ $(DIRECTORY)/si-glu/libnurbs/internals/*.cc \
+ $(DIRECTORY)/si-glu/libnurbs/nurbstess/*.h \
+ $(DIRECTORY)/si-glu/libnurbs/nurbstess/*.cc \
+ $(DIRECTORY)/si-glu/libtess/README \
+ $(DIRECTORY)/si-glu/libtess/alg-outline \
+ $(DIRECTORY)/si-glu/libtess/*.[ch] \
+ $(DIRECTORY)/si-glu/libutil/*.[ch] \
$(DIRECTORY)/src-glu/README[12] \
$(DIRECTORY)/src-glu/Makefile* \
$(DIRECTORY)/src-glu/descrip.mms \
$(DIRECTORY)/src-glu/mms_depend \
$(DIRECTORY)/src-glu/*.def \
- $(DIRECTORY)/src-glu/*.dja \
$(DIRECTORY)/src-glu/depend \
$(DIRECTORY)/src-glu/*.[ch] \
$(DIRECTORY)/widgets-mesa/ChangeLog \
$(DIRECTORY)/widgets-mesa/README \
$(DIRECTORY)/widgets-mesa/TODO \
$(DIRECTORY)/widgets-mesa/configure \
+ $(DIRECTORY)/widgets-mesa/configure.in \
$(DIRECTORY)/widgets-mesa/demos/ChangeLog \
$(DIRECTORY)/widgets-mesa/demos/Cube \
$(DIRECTORY)/widgets-mesa/demos/Ed \
$(DIRECTORY)/widgets-mesa/man/Makefile.in \
$(DIRECTORY)/widgets-mesa/man/Mesa* \
$(DIRECTORY)/widgets-mesa/src/ChangeLog \
- $(DIRECTORY)/widgets-mesa/*.[ch] \
- $(DIRECTORY)/widgets-mesa/Makefile.in \
+ $(DIRECTORY)/widgets-mesa/src/*.c \
+ $(DIRECTORY)/widgets-mesa/src/Makefile.in \
$(DIRECTORY)/widgets-sgi/*.[ch] \
$(DIRECTORY)/widgets-sgi/Makefile* \
$(DIRECTORY)/widgets-sgi/README \
$(DIRECTORY)/util/Makefile.in \
$(DIRECTORY)/util/*.[ch] \
$(DIRECTORY)/util/sampleMakefile \
+ $(DIRECTORY)/vms/analyze_map.com \
+ $(DIRECTORY)/vms/xlib.opt \
+ $(DIRECTORY)/vms/xlib_share.opt \
$(DIRECTORY)/BeOS/Makefile \
$(DIRECTORY)/BeOS/*.cpp \
$(DIRECTORY)/WIN32/NMAKE.MAK \
$(DIRECTORY)/demos/Makefile* \
$(DIRECTORY)/demos/descrip.mms \
$(DIRECTORY)/demos/*.[ch] \
+ $(DIRECTORY)/demos/*.cxx \
$(DIRECTORY)/demos/*.dat \
+ $(DIRECTORY)/demos/README \
$(DIRECTORY)/xdemos/Makefile* \
$(DIRECTORY)/xdemos/descrip.mms \
$(DIRECTORY)/xdemos/*.[cf] \
$(DIRECTORY)/samples/Makefile* \
$(DIRECTORY)/samples/README \
$(DIRECTORY)/samples/*.c \
- $(DIRECTORY)/samples/*.dja \
- $(DIRECTORY)/3Dfx \
$(DIRECTORY)/mtdemos \
$(DIRECTORY)/ggi
+SI_GLU_FILES = \
+ $(DIRECTORY)/Makefile* \
+ $(DIRECTORY)/Make-config \
+ $(DIRECTORY)/bin/mklib* \
+ $(DIRECTORY)/include/GL/glu.h \
+ $(DIRECTORY)/si-glu/Makefile.X11 \
+ $(DIRECTORY)/si-glu/include/gluos.h \
+ $(DIRECTORY)/si-glu/libnurbs/interface/*.h \
+ $(DIRECTORY)/si-glu/libnurbs/interface/*.cc \
+ $(DIRECTORY)/si-glu/libnurbs/internals/*.h \
+ $(DIRECTORY)/si-glu/libnurbs/internals/*.cc \
+ $(DIRECTORY)/si-glu/libnurbs/nurbstess/*.h \
+ $(DIRECTORY)/si-glu/libnurbs/nurbstess/*.cc \
+ $(DIRECTORY)/si-glu/libtess/README \
+ $(DIRECTORY)/si-glu/libtess/alg-outline \
+ $(DIRECTORY)/si-glu/libtess/*.[ch] \
+ $(DIRECTORY)/si-glu/libutil/*.[ch]
+
GLU_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/src-glu/descrip.mms \
$(DIRECTORY)/src-glu/mms_depend \
$(DIRECTORY)/src-glu/*.def \
- $(DIRECTORY)/src-glu/*.dja \
$(DIRECTORY)/src-glu/depend \
$(DIRECTORY)/src-glu/*.[ch]
lib_zip:
+ -rm $(LIB_NAME).zip ; \
cp Makefile.X11 Makefile ; \
- -rm $(LIB_NAME).zip
cd .. ; \
zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
mv $(LIB_NAME).zip $(DIRECTORY)
demo_zip:
- -rm $(DEMO_NAME).zip
+ -rm $(DEMO_NAME).zip ; \
cd .. ; \
zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
mv $(DEMO_NAME).zip $(DIRECTORY)