Update after disk crash

1 files changed, 122 insertions, 116 deletions

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index d6ab05799d..e6aeb8352e 100644
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -1,6 +1,5 @@
-# Makefile for core library for VMS
+# Makefile for GLUT for VMS
 # contributed by Jouk Jansen  joukj@crys.chem.uva.nl
-# Last revision : 3 May 1999
 
 .first
 	define gl [-.include.gl]
@@ -8,69 +7,122 @@
 .include [-]mms-config.
 
 ##### MACROS #####
+GLUT_MAJOR = 3
+GLUT_MINOR = 7
 
 VPATH = RCS
 
 INCDIR = [-.include]
 LIBDIR = [-.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(FBIND=1)
-
-CORE_SOURCES = accum.c alpha.c alphabuf.c api1.c api2.c apiext.c attrib.c \
-bitmap.c blend.c clip.c colortab.c context.c copypix.c depth.c \
-dlist.c drawpix.c enable.c eval.c feedback.c fog.c \
-get.c hash.c image.c light.c lines.c logic.c masking.c matrix.c \
-misc.c mmath.c mthreads.c pb.c pixel.c points.c pointers.c polygon.c \
-quads.c rastpos.c readpix.c rect.c scissor.c shade.c span.c \
-stencil.c teximage.c texobj.c texstate.c texture.c translate.c triangle.c \
-varray.c winpos.c vb.c vbcull.c vbfill.c vbrender.c vbxform.c xform.c \
-zoom.c bbox.c cva.c vector.c vbindirect.c config.c enums.c extensions.c \
-pipeline.c [.x86]x86.c
-
-DRIVER_SOURCES = [.x]glxapi.c [.x]fakeglx.c [.x]realglx.c [.x]xfonts.c \
-[.x]xmesa1.c [.x]xmesa2.c [.x]xmesa3.c [.x]xmesa4.c \
-[.osmesa]osmesa.c \
-[.svga]svgamesa.c \
-[.fx]fxapi.c [.fx]fxdd.c [.fx]fxddtex.c [.fx]fxvsetup.c [.fx]fxsetup.c \
-[.fx]fxtrifuncs.c \
-[.fx]fxrender.c [.fx]fxtexman.c [.fx]fxddspan.c [.fx]fxcva.c
-
-ASM_SOURCES =
-
-OBJECTS =\
-accum.obj,alpha.obj,alphabuf.obj,api1.obj,api2.obj,apiext.obj,attrib.obj,\
-bitmap.obj,blend.obj,clip.obj,colortab.obj,context.obj,copypix.obj,depth.obj,\
-dlist.obj,drawpix.obj,enable.obj,eval.obj,feedback.obj,fog.obj
-
-
-OBJECTS3=get.obj,hash.obj,image.obj,light.obj,lines.obj,logic.obj,masking.obj,matrix.obj,\
-misc.obj,mmath.obj,mthreads.obj,pb.obj,pixel.obj,points.obj,pointers.obj,polygon.obj,\
-quads.obj,rastpos.obj,readpix.obj,rect.obj,scissor.obj,shade.obj,span.obj
-
-
-OBJECTS4=stencil.obj,teximage.obj,texobj.obj,texstate.obj,texture.obj,translate.obj,\
-triangle.obj,varray.obj,winpos.obj,vb.obj,vbcull.obj,vbfill.obj,vbrender.obj
-
-OBJECTS6=vbxform.obj,xform.obj,zoom.obj,bbox.obj,cva.obj,vector.obj,vbindirect.obj,\
-	config.obj,enums.obj,extensions.obj,pipeline.obj,[.x86]x86.obj
-
-OBJECTS2=[.x]glxapi.obj,[.x]fakeglx.obj,[.x]realglx.obj,[.x]xfonts.obj,\
-[.x]xmesa1.obj,[.x]xmesa2.obj,[.x]xmesa3.obj,[.x]xmesa4.obj,\
-[.osmesa]osmesa.obj,\
-[.svga]svgamesa.obj
-
-OBJECTS5=[.fx]fxapi.obj,[.fx]fxdd.obj,[.fx]fxddtex.obj,[.fx]fxvsetup.obj,\
-[.fx]fxsetup.obj,\
-[.fx]fxtrifuncs.obj,\
-[.fx]fxrender.obj,[.fx]fxtexman.obj,[.fx]fxddspan.obj,[.fx]fxcva.obj
+CFLAGS = /nowarn/include=$(INCDIR)/prefix=all
+
+SOURCES = \
+glut_8x13.c \
+glut_9x15.c \
+glut_bitmap.c \
+glut_bwidth.c \
+glut_cindex.c \
+glut_cmap.c \
+glut_cursor.c \
+glut_dials.c \
+glut_dstr.c \
+glut_event.c \
+glut_ext.c \
+glut_fullscrn.c \
+glut_gamemode.c \
+glut_get.c \
+glut_glxext.c \
+glut_hel10.c \
+glut_hel12.c \
+glut_hel18.c \
+glut_init.c \
+glut_input.c \
+glut_joy.c \
+glut_key.c \
+glut_keyctrl.c \
+glut_keyup.c \
+glut_menu.c \
+glut_menu2.c \
+glut_mesa.c \
+glut_modifier.c \
+glut_mroman.c \
+glut_overlay.c \
+glut_roman.c \
+glut_shapes.c \
+glut_space.c \
+glut_stroke.c \
+glut_swap.c \
+glut_swidth.c \
+glut_tablet.c \
+glut_teapot.c \
+glut_tr10.c \
+glut_tr24.c \
+glut_util.c \
+glut_vidresize.c \
+glut_warp.c \
+glut_win.c \
+glut_winmisc.c \
+layerutil.c
+
+OBJECTS = \
+glut_8x13.obj,\
+glut_9x15.obj,\
+glut_bitmap.obj,\
+glut_bwidth.obj,\
+glut_cindex.obj,\
+glut_cmap.obj,\
+glut_cursor.obj,\
+glut_dials.obj,\
+glut_dstr.obj,\
+glut_event.obj,\
+glut_ext.obj,\
+glut_fullscrn.obj,\
+glut_gamemode.obj
+
+OBJECTS1=glut_get.obj,\
+glut_glxext.obj,\
+glut_hel10.obj,\
+glut_hel12.obj,\
+glut_hel18.obj,\
+glut_init.obj,\
+glut_input.obj,\
+glut_joy.obj,\
+glut_key.obj,\
+glut_keyctrl.obj,\
+glut_keyup.obj,\
+glut_menu.obj,\
+glut_menu2.obj,\
+glut_mesa.obj,\
+glut_modifier.obj
+
+OBJECTS2=glut_mroman.obj,\
+glut_overlay.obj,\
+glut_roman.obj,\
+glut_shapes.obj,\
+glut_space.obj,\
+glut_stroke.obj,\
+glut_swap.obj,\
+glut_swidth.obj,\
+glut_tablet.obj,\
+glut_teapot.obj,\
+glut_tr10.obj,\
+glut_tr24.obj,\
+glut_util.obj,\
+glut_vidresize.obj
+
+OBJECTS3=glut_warp.obj,\
+glut_win.obj,\
+glut_winmisc.obj,\
+layerutil.obj
 
 ##### RULES #####
 
-VERSION=Mesa V3.1
+VERSION=Glut V3.7
 
 ##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS),$(OBJECTS2) $(OBJECTS3) $(OBJECTS4)\
-	$(OBJECTS5) $(OBJECTS6)
+
+# Make the library:
+$(LIBDIR)$(GLUT_LIB) : $(OBJECTS) $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
 .ifdef SHARE
   @ WRITE_ SYS$OUTPUT "  generating mesagl1.opt"
   @ OPEN_/WRITE FILE  mesagl1.opt
@@ -78,13 +130,14 @@ $(LIBDIR)$(GL_LIB) : $(OBJECTS),$(OBJECTS2) $(OBJECTS3) $(OBJECTS4)\
   @ WRITE_ FILE "! mesagl1.opt generated by DESCRIP.$(MMS_EXT)" 
   @ WRITE_ FILE "!"
   @ WRITE_ FILE "IDENTIFICATION=""$(VERSION)"""
-  @ WRITE_ FILE "GSMATCH=LEQUAL,3,1
+  @ WRITE_ FILE "GSMATCH=LEQUAL,3,7
   @ WRITE_ FILE "$(OBJECTS)"
-  @ WRITE_ FILE "$(OBJECTS3)"
-  @ WRITE_ FILE "$(OBJECTS4)"
-  @ WRITE_ FILE "$(OBJECTS6)"
+  @ WRITE_ FILE "$(OBJECTS1)"
   @ WRITE_ FILE "$(OBJECTS2)"
-  @ WRITE_ FILE "$(OBJECTS5)"
+  @ WRITE_ FILE "$(OBJECTS3)"
+  @ WRITE_ FILE "[-.lib]libmesaglu.exe/SHARE"
+  @ WRITE_ FILE "[-.lib]libmesagl.exe/SHARE"
+  @ write file "sys$library:decw$xmulibshr.exe/share"
   @ WRITE_ FILE "SYS$SHARE:DECW$XEXTLIBSHR/SHARE"
   @ WRITE_ FILE "SYS$SHARE:DECW$XLIBSHR/SHARE"
   @ CLOSE_ FILE
@@ -92,65 +145,18 @@ $(LIBDIR)$(GL_LIB) : $(OBJECTS),$(OBJECTS2) $(OBJECTS3) $(OBJECTS4)\
   @ LINK_/NODEB/NOSHARE/NOEXE/MAP=mesagl.map/FULL mesagl1.opt/OPT
   @ WRITE_ SYS$OUTPUT "  analyzing mesagl.map ..."
   @ @[-.vms]ANALYZE_MAP.COM mesagl.map mesagl.opt
-  @ WRITE_ SYS$OUTPUT "  linking $(GL_LIB) ..."
-  @ LINK_/NODEB/SHARE=$(GL_LIB)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
+  @ WRITE_ SYS$OUTPUT "  linking $(GLUT_LIB) ..."
+  @ LINK_/NODEB/SHARE=$(GLUT_LIB)/MAP=mesagl.map/FULL mesagl1.opt/opt,mesagl.opt/opt
 .else
-  @ $(MAKELIB) $(GL_LIB) $(OBJECTS)
-  @ library $(GL_LIB) $(OBJECTS2)
-  @ library $(GL_LIB) $(OBJECTS3)
-  @ library $(GL_LIB) $(OBJECTS4)
-  @ library $(GL_LIB) $(OBJECTS5)
-  @ library $(GL_LIB) $(OBJECTS6)
+  @ $(MAKELIB) $(GLUT_LIB) $(OBJECTS)
+  @ library $(GLUT_LIB) $(OBJECTS1)
+  @ library $(GLUT_LIB) $(OBJECTS2)
+  @ library $(GLUT_LIB) $(OBJECTS3)
 .endif
-  @ rename $(GL_LIB)* $(LIBDIR)
+  @ rename $(GLUT_LIB)* $(LIBDIR)
 
 clean :
-	purge
 	delete *.obj;*
+	purge
 
-triangle.obj : triangle.c
-
-[.x86]x86.obj : [.x86]x86.c
-	$(CC) $(CFLAGS) /obj=[.x86]x86.obj [.x86]x86.c
-[.x]glxapi.obj : [.x]glxapi.c
-	$(CC) $(CFLAGS) /obj=[.x]glxapi.obj [.x]glxapi.c
-[.x]fakeglx.obj : [.x]fakeglx.c
-	$(CC) $(CFLAGS) /obj=[.x]fakeglx.obj [.x]fakeglx.c
-[.x]realglx.obj : [.x]realglx.c
-	$(CC) $(CFLAGS) /obj=[.x]realglx.obj [.x]realglx.c
-[.x]xfonts.obj : [.x]xfonts.c
-	$(CC) $(CFLAGS) /obj=[.x]xfonts.obj [.x]xfonts.c
-[.x]xmesa1.obj : [.x]xmesa1.c
-	$(CC) $(CFLAGS) /obj=[.x]xmesa1.obj [.x]xmesa1.c
-[.x]xmesa2.obj : [.x]xmesa2.c
-	$(CC) $(CFLAGS) /obj=[.x]xmesa2.obj [.x]xmesa2.c
-[.x]xmesa3.obj : [.x]xmesa3.c
-	$(CC) $(CFLAGS) /obj=[.x]xmesa3.obj [.x]xmesa3.c
-[.x]xmesa4.obj : [.x]xmesa4.c
-	$(CC) $(CFLAGS) /obj=[.x]xmesa4.obj [.x]xmesa4.c
-[.osmesa]osmesa.obj : [.osmesa]osmesa.c
-	$(CC) $(CFLAGS) /obj=[.osmesa]osmesa.obj [.osmesa]osmesa.c
-[.svga]svgamesa.obj : [.svga]svgamesa.c
-	$(CC) $(CFLAGS) /obj=[.svga]svgamesa.obj [.svga]svgamesa.c
-[.fx]fxapi.obj : [.fx]fxapi.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxapi.obj [.fx]fxapi.c
-[.fx]fxcva.obj : [.fx]fxcva.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxcva.obj [.fx]fxcva.c
-[.fx]fxdd.obj : [.fx]fxdd.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxdd.obj [.fx]fxdd.c
-[.fx]fxddtex.obj : [.fx]fxddtex.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxddtex.obj [.fx]fxddtex.c
-[.fx]fxvsetup.obj : [.fx]fxvsetup.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxvsetup.obj [.fx]fxvsetup.c
-[.fx]fxsetup.obj : [.fx]fxsetup.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxsetup.obj [.fx]fxsetup.c
-[.fx]fxtrifuncs.obj : [.fx]fxtrifuncs.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxtrifuncs.obj [.fx]fxtrifuncs.c
-[.fx]fxrender.obj : [.fx]fxrender.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxrender.obj [.fx]fxrender.c
-[.fx]fxtexman.obj : [.fx]fxtexman.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxtexman.obj [.fx]fxtexman.c
-[.fx]fxddspan.obj : [.fx]fxddspan.c
-	$(CC) $(CFLAGS) /obj=[.fx]fxddspan.obj [.fx]fxddspan.c
-
-.include mms_depend.
+include mms_depend.