Modified: vendor/Mesa3D/current/Makefile
Modified: vendor/Mesa3D/current/Makefile.DJ
Modified: vendor/Mesa3D/current/Makefile.mgw
Deleted: vendor/Mesa3D/current/Mesa.dsw
Modified: vendor/Mesa3D/current/bin/installmesa
Modified: vendor/Mesa3D/current/bin/mklib
Modified: vendor/Mesa3D/current/configs/CVS/Entries
Added: vendor/Mesa3D/current/configs/CVS/Tag
Modified: vendor/Mesa3D/current/configs/darwin
Modified: vendor/Mesa3D/current/configs/default
Modified: vendor/Mesa3D/current/configs/freebsd
Added: vendor/Mesa3D/current/configs/freebsd-dri
Added: vendor/Mesa3D/current/configs/freebsd-dri-amd64
Added: vendor/Mesa3D/current/configs/freebsd-dri-x86
Modified: vendor/Mesa3D/current/configs/linux
Modified: vendor/Mesa3D/current/configs/linux-debug
Added: vendor/Mesa3D/current/configs/linux-directfb
Modified: vendor/Mesa3D/current/configs/linux-dri
Added: vendor/Mesa3D/current/configs/linux-dri-ppc
Modified: vendor/Mesa3D/current/configs/linux-dri-x86
Modified: vendor/Mesa3D/current/configs/linux-dri-x86-64
Added: vendor/Mesa3D/current/configs/linux-fbdev
Added: vendor/Mesa3D/current/configs/linux-indirect
Modified: vendor/Mesa3D/current/configs/linux-ppc
Modified: vendor/Mesa3D/current/configs/linux-ppc-static
Added: vendor/Mesa3D/current/configs/linux-profile
Modified: vendor/Mesa3D/current/configs/linux-solo
Modified: vendor/Mesa3D/current/configs/linux-solo-ia64
Modified: vendor/Mesa3D/current/configs/linux-solo-x86
Modified: vendor/Mesa3D/current/configs/linux-sparc
Modified: vendor/Mesa3D/current/configs/linux-static
Modified: vendor/Mesa3D/current/configs/linux-tcc
Modified: vendor/Mesa3D/current/configs/linux-x86
Added: vendor/Mesa3D/current/configs/linux-x86-32
Modified: vendor/Mesa3D/current/configs/linux-x86-64
Added: vendor/Mesa3D/current/configs/linux-x86-64-debug
Modified: vendor/Mesa3D/current/configs/linux-x86-64-static
Modified: vendor/Mesa3D/current/configs/linux-x86-debug
Modified: vendor/Mesa3D/current/configs/linux-x86-static
Added: vendor/Mesa3D/current/configs/linux-x86-xcb
Modified: vendor/Mesa3D/current/configs/osf1
Modified: vendor/Mesa3D/current/configs/solaris-x86
Modified: vendor/Mesa3D/current/configs/sunos5-gcc
Modified: vendor/Mesa3D/current/descrip.mms
Deleted: vendor/Mesa3D/current/docs/INSTALL.GNU
Modified: vendor/Mesa3D/current/docs/README.3DFX
Modified: vendor/Mesa3D/current/docs/README.BEOS
Modified: vendor/Mesa3D/current/docs/README.DJ
Modified: vendor/Mesa3D/current/docs/README.MINGW32
Modified: vendor/Mesa3D/current/docs/README.VMS
Modified: vendor/Mesa3D/current/docs/README.WIN32
Added: vendor/Mesa3D/current/docs/README.directfb
Modified: vendor/Mesa3D/current/docs/RELNOTES-6.2
Added: vendor/Mesa3D/current/docs/RELNOTES-6.2.1
Added: vendor/Mesa3D/current/docs/RELNOTES-6.3
Added: vendor/Mesa3D/current/docs/RELNOTES-6.3.1
Added: vendor/Mesa3D/current/docs/RELNOTES-6.3.2
Added: vendor/Mesa3D/current/docs/RELNOTES-6.4
Modified: vendor/Mesa3D/current/docs/VERSIONS
Modified: vendor/Mesa3D/current/docs/banner.html
Modified: vendor/Mesa3D/current/docs/bugs.html
Modified: vendor/Mesa3D/current/docs/conform.html
Modified: vendor/Mesa3D/current/docs/contents.html
Modified: vendor/Mesa3D/current/docs/custom.html
Modified: vendor/Mesa3D/current/docs/cvs_access.html
Modified: vendor/Mesa3D/current/docs/cvs_branches.html
Modified: vendor/Mesa3D/current/docs/debugging.html
Modified: vendor/Mesa3D/current/docs/demos.html
Modified: vendor/Mesa3D/current/docs/devinfo.html
Modified: vendor/Mesa3D/current/docs/download.html
Modified: vendor/Mesa3D/current/docs/envvars.html
Modified: vendor/Mesa3D/current/docs/extensions.html
Modified: vendor/Mesa3D/current/docs/faq.html
Modified: vendor/Mesa3D/current/docs/fbdev-dri.html
Modified: vendor/Mesa3D/current/docs/games.html
Modified: vendor/Mesa3D/current/docs/glfbdev-driver.html
Modified: vendor/Mesa3D/current/docs/glu.html
Modified: vendor/Mesa3D/current/docs/helpwanted.html
Modified: vendor/Mesa3D/current/docs/index.html
Modified: vendor/Mesa3D/current/docs/install.html
Modified: vendor/Mesa3D/current/docs/intro.html
Modified: vendor/Mesa3D/current/docs/libraries.html
Modified: vendor/Mesa3D/current/docs/license.html
Modified: vendor/Mesa3D/current/docs/lists.html
Modified: vendor/Mesa3D/current/docs/mangling.html
Modified: vendor/Mesa3D/current/docs/modelers.html
Modified: vendor/Mesa3D/current/docs/news.html
Modified: vendor/Mesa3D/current/docs/osmesa.html
Modified: vendor/Mesa3D/current/docs/pbuffers.html
Modified: vendor/Mesa3D/current/docs/perf.html
Modified: vendor/Mesa3D/current/docs/precompiled.html
Modified: vendor/Mesa3D/current/docs/relnotes.html
Modified: vendor/Mesa3D/current/docs/science.html
Modified: vendor/Mesa3D/current/docs/sourcedocs.html
Modified: vendor/Mesa3D/current/docs/subset.html
Modified: vendor/Mesa3D/current/docs/systems.html
Modified: vendor/Mesa3D/current/docs/thanks.html
Modified: vendor/Mesa3D/current/docs/utilities.html
Modified: vendor/Mesa3D/current/docs/utility.html
Modified: vendor/Mesa3D/current/docs/webmaster.html
[truncated at 100 lines; 1113 more skipped]
--- vendor/Mesa3D/current/Makefile 2005-11-04 16:26:13 UTC (rev 18996)
+++ vendor/Mesa3D/current/Makefile 2005-11-04 16:36:25 UTC (rev 18997)
@@ -25,12 +25,21 @@
$(MAKE) clean
-rm -rf lib*
-rm -f $(TOP)/configs/current
+ -rm -f `find . -name \*.o`
+ -rm -f `find . -name \*.a`
+ -rm -f `find . -name \*.so`
+ -rm -f `find . -name depend`
+
install:
@echo "Installing"
- $(TOP)/bin/installmesa
+ $(TOP)/bin/installmesa $(DESTDIR)
+# DirectFBGL module installation
+linux-directfb-install:
+ cd src/mesa/drivers/directfb && $(MAKE) install
+
# If there's no current configuration file
$(TOP)/configs/current:
@echo
@@ -52,6 +61,9 @@
darwin \
darwin-static \
freebsd \
+freebsd-dri \
+freebsd-dri-amd64 \
+freebsd-dri-x86 \
hpux10 \
hpux10-gcc \
hpux10-static \
@@ -72,9 +84,13 @@
linux-alpha \
linux-alpha-static \
linux-debug \
+linux-directfb \
linux-dri \
linux-dri-x86 \
linux-dri-x86-64 \
+linux-dri-ppc \
+linux-indirect \
+linux-fbdev \
linux-glide \
linux-icc \
linux-icc-static \
@@ -93,8 +109,11 @@
linux-tcc \
linux-x86 \
linux-x86-debug \
+linux-x86-32 \
linux-x86-64 \
+linux-x86-64-debug \
linux-x86-64-static \
+linux-x86-xcb \
linux-x86-glide \
linux-x86-static \
netbsd \
@@ -115,28 +134,28 @@
# Rules for making release tarballs
-DIRECTORY = Mesa-6.2
-LIB_NAME = MesaLib-6.2
-DEMO_NAME = MesaDemos-6.2
+DIRECTORY = Mesa-6.4
+LIB_NAME = MesaLib-6.4
+DEMO_NAME = MesaDemos-6.4
+GLUT_NAME = MesaGLUT-6.4
-LIB_FILES = \
+MAIN_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/descrip.mms \
$(DIRECTORY)/mms-config. \
- $(DIRECTORY)/Mesa.dsw \
$(DIRECTORY)/bin/mklib \
$(DIRECTORY)/bin/installmesa \
$(DIRECTORY)/configs/[a-z]* \
$(DIRECTORY)/docs/*.html \
$(DIRECTORY)/docs/COPYING \
- $(DIRECTORY)/docs/INSTALL.GNU \
$(DIRECTORY)/docs/README.* \
$(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/VERSIONS \
$(DIRECTORY)/docs/*.spec \
$(DIRECTORY)/include/GL/internal/glcore.h \
+ $(DIRECTORY)/include/GL/amesa.h \
$(DIRECTORY)/include/GL/dmesa.h \
- $(DIRECTORY)/include/GL/amesa.h \
+ $(DIRECTORY)/include/GL/directfbgl.h \
$(DIRECTORY)/include/GL/fxmesa.h \
$(DIRECTORY)/include/GL/ggimesa.h \
$(DIRECTORY)/include/GL/gl.h \
@@ -157,6 +176,7 @@
$(DIRECTORY)/include/GL/xmesa.h \
$(DIRECTORY)/include/GL/xmesa_x.h \
$(DIRECTORY)/include/GL/xmesa_xf86.h \
+ $(DIRECTORY)/include/GLView.h \
$(DIRECTORY)/src/Makefile \
$(DIRECTORY)/src/descrip.mms \
$(DIRECTORY)/src/mesa/Makefile* \
@@ -164,28 +184,25 @@
$(DIRECTORY)/src/mesa/descrip.mms \
$(DIRECTORY)/src/mesa/depend \
$(DIRECTORY)/src/mesa/main/*.[chS] \
- $(DIRECTORY)/src/mesa/main/main.dsp \
$(DIRECTORY)/src/mesa/main/descrip.mms \
$(DIRECTORY)/src/mesa/glapi/*.[chS] \
- $(DIRECTORY)/src/mesa/glapi/glapi.dsp \
$(DIRECTORY)/src/mesa/glapi/descrip.mms \
$(DIRECTORY)/src/mesa/array_cache/*.[ch] \
- $(DIRECTORY)/src/mesa/array_cache/array_cache.dsp \
$(DIRECTORY)/src/mesa/array_cache/descrip.mms \
$(DIRECTORY)/src/mesa/math/*.[ch] \
- $(DIRECTORY)/src/mesa/math/math.dsp \
$(DIRECTORY)/src/mesa/math/descrip.mms \
$(DIRECTORY)/src/mesa/shader/*.[ch] \
- $(DIRECTORY)/src/mesa/shader/shader.dsp \
$(DIRECTORY)/src/mesa/shader/descrip.mms \
+ $(DIRECTORY)/src/mesa/shader/grammar/*.[ch] \
+ $(DIRECTORY)/src/mesa/shader/grammar/descrip.mms \
+ $(DIRECTORY)/src/mesa/shader/slang/*.[ch] \
+ $(DIRECTORY)/src/mesa/shader/slang/descrip.mms \
+ $(DIRECTORY)/src/mesa/shader/slang/library/*.[ch] \
$(DIRECTORY)/src/mesa/swrast/*.[ch] \
- $(DIRECTORY)/src/mesa/swrast/swrast.dsp \
$(DIRECTORY)/src/mesa/swrast/descrip.mms \
$(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \
- $(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp \
$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \
$(DIRECTORY)/src/mesa/tnl/*.[chS] \
- $(DIRECTORY)/src/mesa/tnl/tnl.dsp \
$(DIRECTORY)/src/mesa/tnl/descrip.mms \
$(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \
@@ -194,11 +211,11 @@
$(DIRECTORY)/src/mesa/drivers/beos/Makefile \
$(DIRECTORY)/src/mesa/drivers/common/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/common/descrip.mms \
+ $(DIRECTORY)/src/mesa/drivers/directfb/*.[ch] \
+ $(DIRECTORY)/src/mesa/drivers/directfb/Makefile \
$(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \
- $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c \
$(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \
- $(DIRECTORY)/src/mesa/drivers/glide/*.def \
$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \
@@ -209,26 +226,62 @@
$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \
$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \
- $(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.dsp \
$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.def \
- $(DIRECTORY)/src/mesa/drivers/windows/*/*.dsp \
$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \
+ $(DIRECTORY)/src/mesa/ppc/*.[ch] \
$(DIRECTORY)/src/mesa/sparc/*.[chS] \
$(DIRECTORY)/src/mesa/x86/Makefile \
$(DIRECTORY)/src/mesa/x86/*.[ch] \
$(DIRECTORY)/src/mesa/x86/*.S \
+ $(DIRECTORY)/src/mesa/x86/rtasm/*.[ch] \
+ $(DIRECTORY)/src/mesa/x86-64/*.[chS] \
+ $(DIRECTORY)/src/mesa/x86-64/Makefile \
+ $(DIRECTORY)/progs/Makefile \
+ $(DIRECTORY)/progs/util/README \
+ $(DIRECTORY)/progs/util/*.[ch] \
+ $(DIRECTORY)/progs/util/sampleMakefile \
+ $(DIRECTORY)/vms/analyze_map.com \
+ $(DIRECTORY)/vms/xlib.opt \
+ $(DIRECTORY)/vms/xlib_share.opt \
+ $(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp \
+ $(DIRECTORY)/windows/VC6/mesa/glu/*.txt \
+ $(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp \
+ $(DIRECTORY)/windows/VC6/mesa/mesa.dsw \
+ $(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp \
+ $(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp \
+ $(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj \
+ $(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj \
+ $(DIRECTORY)/windows/VC7/mesa/mesa.sln \
+ $(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj \
+ $(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj
+
+DRI_FILES = \
+ $(DIRECTORY)/include/GL/internal/dri_interface.h \
+ $(DIRECTORY)/include/GL/internal/sarea.h \
+ $(DIRECTORY)/src/glx/Makefile \
+ $(DIRECTORY)/src/glx/x11/Makefile \
+ $(DIRECTORY)/src/glx/x11/*.[ch] \
+ $(DIRECTORY)/src/mesa/drivers/dri/Makefile \
+ $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \
+ $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \
+ $(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \
+ $(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h \
+ $(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \
+ $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \
+ $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \
+ $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
+
+SGI_GLU_FILES = \
$(DIRECTORY)/src/glu/Makefile \
$(DIRECTORY)/src/glu/descrip.mms \
$(DIRECTORY)/src/glu/sgi/Makefile \
$(DIRECTORY)/src/glu/sgi/Makefile.win \
$(DIRECTORY)/src/glu/sgi/Makefile.DJ \
- $(DIRECTORY)/src/glu/sgi/cc*.txt \
$(DIRECTORY)/src/glu/sgi/glu.def \
- $(DIRECTORY)/src/glu/sgi/glu.dsp \
$(DIRECTORY)/src/glu/sgi/dummy.cc \
$(DIRECTORY)/src/glu/sgi/descrip.mms \
$(DIRECTORY)/src/glu/sgi/mesaglu.opt \
@@ -242,45 +295,24 @@
$(DIRECTORY)/src/glu/sgi/libtess/README \
$(DIRECTORY)/src/glu/sgi/libtess/alg-outline \
$(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \
- $(DIRECTORY)/src/glu/sgi/libutil/*.[ch] \
- $(DIRECTORY)/src/glu/mesa/README[12] \
- $(DIRECTORY)/src/glu/mesa/Makefile* \
- $(DIRECTORY)/src/glu/mesa/descrip.mms \
- $(DIRECTORY)/src/glu/mesa/mms_depend \
- $(DIRECTORY)/src/glu/mesa/*.def \
- $(DIRECTORY)/src/glu/mesa/depend \
- $(DIRECTORY)/src/glu/mesa/*.[ch] \
- $(DIRECTORY)/src/glw/*.[ch] \
- $(DIRECTORY)/src/glw/Makefile* \
- $(DIRECTORY)/src/glw/README \
- $(DIRECTORY)/src/glw/depend \
- $(DIRECTORY)/progs/Makefile \
- $(DIRECTORY)/progs/util/README \
- $(DIRECTORY)/progs/util/*.[ch] \
- $(DIRECTORY)/progs/util/sampleMakefile \
- $(DIRECTORY)/vms/analyze_map.com \
- $(DIRECTORY)/vms/xlib.opt \
- $(DIRECTORY)/vms/xlib_share.opt
+ $(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
+MESA_GLU_FILES = \
+ $(DIRECTORY)/src/glu/mesa/README[12] \
+ $(DIRECTORY)/src/glu/mesa/Makefile* \
+ $(DIRECTORY)/src/glu/mesa/descrip.mms \
+ $(DIRECTORY)/src/glu/mesa/mms_depend \
+ $(DIRECTORY)/src/glu/mesa/*.def \
+ $(DIRECTORY)/src/glu/mesa/depend \
+ $(DIRECTORY)/src/glu/mesa/*.[ch]
-DEMO_FILES = \
- $(DIRECTORY)/include/GL/glut.h \
- $(DIRECTORY)/include/GL/glutf90.h \
- $(DIRECTORY)/src/glut/glx/Makefile* \
- $(DIRECTORY)/src/glut/glx/depend \
- $(DIRECTORY)/src/glut/glx/*def \
- $(DIRECTORY)/src/glut/glx/descrip.mms \
- $(DIRECTORY)/src/glut/glx/mms_depend \
- $(DIRECTORY)/src/glut/glx/glut.dsp \
- $(DIRECTORY)/src/glut/glx/*.[ch] \
- $(DIRECTORY)/src/glut/beos/*.[ch] \
- $(DIRECTORY)/src/glut/beos/*.cpp \
- $(DIRECTORY)/src/glut/beos/Makefile \
- $(DIRECTORY)/src/glut/dos/*.[ch] \
- $(DIRECTORY)/src/glut/dos/Makefile.DJ \
- $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \
- $(DIRECTORY)/src/glut/ggi/*.[ch] \
- $(DIRECTORY)/src/glut/ggi/Makefile \
+GLW_FILES = \
+ $(DIRECTORY)/src/glw/*.[ch] \
+ $(DIRECTORY)/src/glw/Makefile* \
+ $(DIRECTORY)/src/glw/README \
+ $(DIRECTORY)/src/glw/depend
+
+DEMO_FILES = \
$(DIRECTORY)/progs/beos/*.cpp \
$(DIRECTORY)/progs/beos/Makefile \
$(DIRECTORY)/progs/images/*.rgb \
@@ -291,8 +323,6 @@
$(DIRECTORY)/progs/demos/*.cxx \
$(DIRECTORY)/progs/demos/*.dat \
$(DIRECTORY)/progs/demos/README \
- $(DIRECTORY)/progs/demos/Windows/*.dsp \
- $(DIRECTORY)/progs/demos/Windows/*.dsw \
$(DIRECTORY)/progs/xdemos/Makefile* \
$(DIRECTORY)/progs/xdemos/descrip.mms \
$(DIRECTORY)/progs/xdemos/*.[chf] \
@@ -305,68 +335,109 @@
$(DIRECTORY)/progs/windml/Makefile.ugl \
$(DIRECTORY)/progs/windml/*.c \
$(DIRECTORY)/progs/windml/*.bmp \
- $(DIRECTORY)/progs/ggi/*.c
+ $(DIRECTORY)/progs/ggi/*.c \
+ $(DIRECTORY)/windows/VC6/progs/demos/*.dsp \
+ $(DIRECTORY)/windows/VC6/progs/progs.dsw \
+ $(DIRECTORY)/windows/VC7/progs/demos/*.vcproj \
+ $(DIRECTORY)/windows/VC7/progs/progs.sln
+GLUT_FILES = \
+ $(DIRECTORY)/include/GL/glut.h \
+ $(DIRECTORY)/include/GL/glutf90.h \
+ $(DIRECTORY)/src/glut/glx/Makefile* \
+ $(DIRECTORY)/src/glut/glx/depend \
+ $(DIRECTORY)/src/glut/glx/*def \
+ $(DIRECTORY)/src/glut/glx/descrip.mms \
+ $(DIRECTORY)/src/glut/glx/mms_depend \
+ $(DIRECTORY)/src/glut/glx/*.[ch] \
+ $(DIRECTORY)/src/glut/beos/*.[ch] \
+ $(DIRECTORY)/src/glut/beos/*.cpp \
+ $(DIRECTORY)/src/glut/beos/Makefile \
+ $(DIRECTORY)/src/glut/dos/*.[ch] \
+ $(DIRECTORY)/src/glut/dos/Makefile.DJ \
+ $(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \
+ $(DIRECTORY)/src/glut/ggi/*.[ch] \
+ $(DIRECTORY)/src/glut/ggi/Makefile \
+ $(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \
+ $(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
-DRI_FILES = \
- $(DIRECTORY)/src/glx/Makefile \
- $(DIRECTORY)/src/glx/mini/*.[ch] \
- $(DIRECTORY)/src/glx/mini/example.miniglx.conf \
- $(DIRECTORY)/src/glx/mini/NOTES \
- $(DIRECTORY)/src/mesa/drivers/dri/Makefile \
- $(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \
- $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch] \
- $(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h \
- $(DIRECTORY)/src/mesa/drivers/dri/*/*.[ch] \
- $(DIRECTORY)/src/mesa/drivers/dri/*/depend \
- $(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \
- $(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \
- $(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
+DEPEND_FILES = \
+ $(TOP)/src/mesa/depend \
+ $(TOP)/src/glw/depend \
+ $(TOP)/src/glut/glx/depend \
+ $(TOP)/src/glu/sgi/depend
+LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
+
+
# Everything for new a Mesa release:
-tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
+tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
+rm_depend:
+ @for dep in $(DEPEND_FILES) ; do \
+ rm -f $$dep ; \
+ touch $$dep ; \
+ done
+
lib_gz:
rm -f configs/current ; \
cd .. ; \
- tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
+ tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
gzip $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.gz $(DIRECTORY)
demo_gz:
cd .. ; \
- tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+ tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
gzip $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.gz $(DIRECTORY)
+glut_gz:
+ cd .. ; \
+ tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
+ gzip $(GLUT_NAME).tar ; \
+ mv $(GLUT_NAME).tar.gz $(DIRECTORY)
+
lib_bz2:
rm -f configs/current ; \
cd .. ; \
- tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
+ tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
bzip2 $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
demo_bz2:
cd .. ; \
- tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
+ tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
bzip2 $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
+glut_bz2:
+ cd .. ; \
+ tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
+ bzip2 $(GLUT_NAME).tar ; \
+ mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)
+
lib_zip:
rm -f configs/current ; \
- -rm $(LIB_NAME).zip ; \
+ rm -f $(LIB_NAME).zip ; \
cd .. ; \
- zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
+ zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
mv $(LIB_NAME).zip $(DIRECTORY)
demo_zip:
- -rm $(DEMO_NAME).zip ; \
+ rm -f $(DEMO_NAME).zip ; \
cd .. ; \
- zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
+ zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
mv $(DEMO_NAME).zip $(DIRECTORY)
+glut_zip:
+ rm -f $(GLUT_NAME).zip ; \
+ cd .. ; \
+ zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
+ mv $(GLUT_NAME).zip $(DIRECTORY)
+
md5:
@-md5sum $(LIB_NAME).tar.gz
@-md5sum $(LIB_NAME).tar.bz2
@@ -374,3 +445,6 @@
@-md5sum $(DEMO_NAME).tar.gz
@-md5sum $(DEMO_NAME).tar.bz2
@-md5sum $(DEMO_NAME).zip
+ @-md5sum $(GLUT_NAME).tar.gz
+ @-md5sum $(GLUT_NAME).tar.bz2
+ @-md5sum $(GLUT_NAME).zip
--- vendor/Mesa3D/current/Makefile.DJ 2005-11-04 16:26:13 UTC (rev 18996)
+++ vendor/Mesa3D/current/Makefile.DJ 2005-11-04 16:36:25 UTC (rev 18997)
@@ -20,9 +20,9 @@
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# DOS/DJGPP makefile v1.5 for Mesa
+# DOS/DJGPP makefile v1.6 for Mesa
#
-# Copyright (C) 2002 - Borca Daniel
+# Copyright (C) 2002 - Daniel Borca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
@@ -31,8 +31,6 @@
# Available options:
#
# Environment variables:
-# CPU optimize for the given processor.
-# default = pentium
# GLU=[mesa|sgi] specify GLU directory; can be `sgi' (requires GNU/C++)
# or `mesa'.
# default = mesa
@@ -59,12 +57,10 @@
.PHONY : all libgl libglu libglut clean realclean
-CPU ?= pentium
-
GLU ?= mesa
CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS += -O2 -ffast-math
export CFLAGS
--- vendor/Mesa3D/current/Makefile.mgw 2005-11-04 16:26:13 UTC (rev 18996)
+++ vendor/Mesa3D/current/Makefile.mgw 2005-11-04 16:36:25 UTC (rev 18997)
@@ -20,9 +20,9 @@
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# MinGW makefile v1.1 for Mesa
+# MinGW makefile v1.2 for Mesa
#
-# Copyright (C) 2002 - Borca Daniel
+# Copyright (C) 2002 - Daniel Borca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
@@ -31,8 +31,6 @@
# Available options:
#
# Environment variables:
-# CPU optimize for the given processor.
-# default = pentium
# GLIDE path to Glide3 SDK; used with FX.
# default = $(TOP)/glide3
# FX=1 build for 3dfx Glide3. Note that this disables
@@ -57,8 +55,6 @@
.PHONY : all libgl clean realclean
-CPU ?= pentium
-
ifeq ($(ICD),1)
# when -std=c99 mingw will not define WIN32
CFLAGS = -Wall -W -Werror
@@ -66,7 +62,7 @@
# I love c89
CFLAGS = -Wall -W -pedantic
endif
-CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
+CFLAGS += -O2 -ffast-math
export CFLAGS
--- vendor/Mesa3D/current/Mesa.dsw 2005-11-04 16:26:13 UTC (rev 18996)
+++ vendor/Mesa3D/current/Mesa.dsw 2005-11-04 16:36:25 UTC (rev 18997)
@@ -1,179 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "array_cache"=".\SRC\MESA\array_cache\array_cache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gdi"=".\src\mesa\drivers\windows\gdi\gdi.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name array_cache
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name main
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name math
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name swrast_setup
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name swrast
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name tnl
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name glapi
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name shader
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "glapi"=".\SRC\MESA\glapi\glapi.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "glu"=".\src\glu\sgi\glu.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name gdi
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "math"=".\SRC\MESA\math\math.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "osmesa"=".\SRC\MESA\DRIVERS\osmesa\osmesa.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name gdi
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "shader"=".\SRC\MESA\shader\shader.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "swrast_setup"=".\SRC\MESA\swrast_setup\swrast_setup.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "tnl"=".\SRC\MESA\tnl\tnl.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- vendor/Mesa3D/current/bin/installmesa 2005-11-04 16:26:13 UTC (rev 18996)
+++ vendor/Mesa3D/current/bin/installmesa 2005-11-04 16:36:25 UTC (rev 18997)
@@ -12,7 +12,7 @@
INCLUDE_DIR="/usr/local/include"
LIB_DIR="/usr/local/lib"
-
+if [ "x$#" = "x0" ] ; then
echo
echo "***** Mesa installation - You may need root privileges to do this *****"
echo
@@ -20,7 +20,7 @@
echo "Enter new directory or press <Enter> to accept this default."
read INPUT
-if [ x${INPUT} != "x" ] ; then
+if [ "x${INPUT}" != "x" ] ; then
INCLUDE_DIR=${INPUT}
fi
@@ -29,11 +29,10 @@
echo "Enter new directory or press <Enter> to accept this default."
read INPUT
-if [ x${INPUT} != "x" ] ; then
+if [ "x${INPUT}" != "x" ] ; then
LIB_DIR=${INPUT}
fi
-
echo
echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
@@ -41,17 +40,30 @@
read INPUT
+else
+INCLUDE_DIR=$1/include
+LIB_DIR=$1/lib
+fi
# flags:
# -f = force
-# -d = preserve symlinks
+# -d = preserve symlinks (does not work on BSD)
+if [ `uname` = "FreeBSD" ] ; then
+ CP_FLAGS="-f"
+else
+ CP_FLAGS="-fd"
+fi
+
+
set -v
mkdir ${INCLUDE_DIR}
mkdir ${INCLUDE_DIR}/GL
+mkdir ${INCLUDE_DIR}/GLES
mkdir ${LIB_DIR}
cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
-cp -fd ${TOP}/lib*/lib* ${LIB_DIR}
+# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
+cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR}
echo "Done."
--- vendor/Mesa3D/current/bin/mklib 2005-11-04 16:26:13 UTC (rev 18996)
+++ vendor/Mesa3D/current/bin/mklib 2005-11-04 16:36:25 UTC (rev 18997)
@@ -1,37 +1,28 @@
#!/bin/sh
# Make a shared library.
-# Basically do a switch/case depending on the OS and make a shared (or static)
-# library conforming to that OS.
+# This script should be useful for projects other than Mesa.
+# Improvements/fixes are welcome.
-# Usage:
-# mklib [options] objects ...
-# Options:
-# -o LIBRARY specifies the name of resulting library
-# ("-o GL" for example, might result in "libGL.so" being made)
-# -major N specifies major version number (default is 1)
-# -minor N specifies minor version number (default is 0)
-# -patch N specifies patch version number (default is 0)
-# -lLIBRARY specifies a dependency on LIBRARY
-# -LDIR search in DIR for library dependencies
-# -cplusplus link with C++ runtime
-# -static make a static library (default is dynamic/shared)
-# -install DIR move resulting library file(s) to DIR
-# -arch ARCH override using `uname` to determine architecture
-# -archopt OPT specify an extra achitecture-specific option OPT
-# -noprefix don't prefix library name with "lib" or any suffix
+# Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
#
-# The library name should just be "GL" or "GLU", etc. The 'lib' prefix
-# will be added here if needed, as well as the ".so" or ".a" suffix,
-# etc (unless the -noprefix option is used).
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
#
-# objects should be: foo.o bar.o etc.o
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
#
-# Environment variables recognized:
-# CC C compiler command
-# CXX C++ compiler command
-#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
@@ -42,12 +33,14 @@
MINOR=0
PATCH=""
DEPS=""
+LINK=""
CPLUSPLUS=0
STATIC=0
INSTALLDIR="."
ARCH="auto"
ARCHOPT=""
NOPREFIX=0
+EXPORTS=""
#
@@ -56,25 +49,93 @@
while true
do
case $1 in
- '-o') shift 1; LIBNAME=$1;;
- '-major') shift 1; MAJOR=$1;;
- '-minor') shift 1; MINOR=$1;;
- '-patch') shift 1; PATCH=$1;;
- -l*) DEPS="$DEPS $1";;
- -L*) DEPS="$DEPS $1";;
- '-cplusplus') CPLUSPLUS=1;;
- '-static') STATIC=1;;
- '-install') shift 1; INSTALLDIR=$1;;
- '-arch') shift 1; ARCH=$1;;
- '-archopt') shift 1; ARCHOPT=$1;;
- '-noprefix') NOPREFIX=1;;
- -*) echo "mklib: Unknown option: " $1 ; exit 1;;
- *) break
+ '-h' | '--help')
+ echo 'Usage: mklib [options] objects'
+ echo 'Create a shared library from object files.'
+ echo ' -o LIBRARY specifies the name of the resulting library, without'
+ echo ' the leading "lib" or any suffix.'
+ echo ' (eg: "-o GL" might result in "libGL.so" being made)'
+ echo ' -major N specifies major version number (default is 1)'
+ echo ' -minor N specifies minor version number (default is 0)'
+ echo ' -patch N specifies patch version number (default is 0)'
+ echo ' -lLIBRARY specifies a dependency on LIBRARY'
+ echo ' -LDIR search in DIR for library dependencies'
+ echo ' -linker L explicity specify the linker program to use (eg: gcc, g++)'
+ echo ' Not observed on all systems at this time.'
+ echo ' -cplusplus link with C++ runtime'
+ echo ' -static make a static library (default is dynamic/shared)'
+ echo ' -install DIR put resulting library file(s) in DIR'
+ echo ' -arch ARCH override using `uname` to determine host system'
+ echo ' -archopt OPT specify an extra achitecture-specific option OPT'
+ echo " -noprefix don't prefix library name with 'lib' nor add any suffix"
+ echo ' -exports FILE only export the symbols listed in FILE'
+ echo ' -h, --help display this information and exit'
+ exit 1
+ ;;
+ '-o')
+ shift 1;
+ LIBNAME=$1
+ ;;
+ '-major')
+ shift 1;
+ MAJOR=$1
+ ;;
+ '-minor')
+ shift 1;
+ MINOR=$1
+ ;;
+ '-patch')
+ shift 1;
+ PATCH=$1
+ ;;
+ '-linker')
+ shift 1;
+ LINK=$1
+ ;;
+ -l*)
+ DEPS="$DEPS $1"
+ ;;
+ -L*)
+ DEPS="$DEPS $1"
+ ;;
+ '-cplusplus')
+ CPLUSPLUS=1
+ ;;
+ '-static')
+ STATIC=1
+ ;;
+ '-install')
+ shift 1;
+ INSTALLDIR=$1
+ ;;
+ '-arch')
+ shift 1;
+ ARCH=$1
+ ;;
+ '-archopt')
+ shift 1;
+ ARCHOPT=$1
+ ;;
+ '-noprefix')
+ NOPREFIX=1
+ ;;
+ '-exports')
+ shift 1;
+ EXPORTS=$1
+ ;;
+ -*)
+ echo "mklib: Unknown option: " $1 ;
+ exit 1
+ ;;
+ *)
+ # This should be the first object file, stop parsing
+ break
esac
shift 1
done
OBJECTS=$@
+
if [ ${ARCH} = "auto" ] ; then
ARCH=`uname`
fi
@@ -104,6 +165,7 @@
echo MINOR is $MINOR
echo PATCH is $PATCH
echo DEPS are $DEPS
+ echo "EXPORTS in" $EXPORTS
echo "-----------------"
fi
@@ -114,20 +176,32 @@
case $ARCH in
'Linux' | 'OpenBSD')
- # GCC-based environment
+ # we assume gcc
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+ LINK=g++
+ else
+ LINK=gcc
+ fi
+ fi
+
if [ $NOPREFIX = 1 ] ; then
# No "lib" or ".so" part
echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}
#OPTS="-shared -Wl,-soname,${LIBNAME}" # soname???
OPTS="-shared"
- if [ $CPLUSPLUS = 1 ] ; then
- LINK=$CXX
- else
- LINK=$CC
- fi
+
+ # Check if objects are 32-bit and we're running in 64-bit
+ # environment. If so, pass -m32 flag to linker.
+ set ${OBJECTS}
+ ABI32=`file $1 | grep 32-bit`
+ if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+ OPTS="-m32 ${OPTS}"
+ fi
+
rm -f ${LIBNAME}
-
# make lib
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
# finish up
@@ -149,6 +223,27 @@
else
[truncated at 1000 lines; 498025 more skipped]