Committing in .

 Updated OpenVMS compile support

 Modified Files:
 	Mesa/Makefile.X11 Mesa/src/mesa/descrip.mms
 	Mesa/src/mesa/drivers/osmesa/descrip.mms
 	Mesa/src/mesa/drivers/x11/descrip.mms
 Added Files:
 	Mesa/src/mesa/drivers/common/descrip.mms
 ----------------------------------------------------------------------

diff --git a/Makefile.X11 b/Makefile.X11
index 565b4cf7326b69610e2a78416ab4fc2805591de5..806f49d09bed461536e649a1731665f4139353b1 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.108 2004/01/19 16:56:50 brianp Exp $
+# $Id: Makefile.X11,v 1.109 2004/01/22 15:02:17 joukj Exp $
 
 # Mesa 3-D graphics library
 # Version:  6.1
@@ -549,6 +549,7 @@ LIB_FILES = \
        $(DIRECTORY)/src/mesa/drivers/beos/*.cpp                        \
        $(DIRECTORY)/src/mesa/drivers/beos/*.h                          \
        $(DIRECTORY)/src/mesa/drivers/common/*.[ch]                     \
+       $(DIRECTORY)/src/mesa/drivers/common/descrip.mms                        \
        $(DIRECTORY)/src/mesa/drivers/dos/*.[chS]                       \
        $(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]                 \
        $(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c                   \

diff --git a/src/mesa/descrip.mms b/src/mesa/descrip.mms
index 81204cfaca39e8c7036658caa87f65ddc13ce0cf..5df9ce37ad3a60170696a626408b955bb5305ba9 100644 (file)
--- a/src/mesa/descrip.mms
+++ b/src/mesa/descrip.mms
@@ -1,22 +1,24 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-
-all :
-       set default [.main]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [-.glapi]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [-.drivers.x11]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [-.osmesa]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [--.math]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [-.tnl]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [-.swrast]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [-.swrast_setup]
-       $(MMS)$(MMSQUALIFIERS)
-       set default [-.array_cache]
-       $(MMS)$(MMSQUALIFIERS)
+# Makefile for Mesa for VMS\r
+# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl\r
+\r
+all :\r
+       set default [.main]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.glapi]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.drivers.common]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.x11]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.osmesa]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [--.math]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.tnl]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.swrast]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.swrast_setup]\r
+       $(MMS)$(MMSQUALIFIERS)\r
+       set default [-.array_cache]\r
+       $(MMS)$(MMSQUALIFIERS)\r

diff --git a/src/mesa/drivers/common/descrip.mms b/src/mesa/drivers/common/descrip.mms
new file mode 100644 (file)
index 0000000..eb49c32
--- /dev/null
+++ b/src/mesa/drivers/common/descrip.mms
@@ -0,0 +1,37 @@
+# Makefile for core library for VMS\r
+# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl\r
+# Last revision : 16 June 2003\r
+\r
+.first\r
+       define gl [----.include.gl]\r
+       define math [--.math]\r
+       define swrast [--.swrast]\r
+\r
+.include [----]mms-config.\r
+\r
+##### MACROS #####\r
+\r
+VPATH = RCS\r
+\r
+INCDIR = [----.include],[--.main],[--.glapi]\r
+LIBDIR = [----.lib]\r
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)\r
+\r
+SOURCES = driverfuncs.c\r
+\r
+OBJECTS =driverfuncs.obj\r
+\r
+##### RULES #####\r
+\r
+VERSION=Mesa V3.4\r
+\r
+##### TARGETS #####\r
+# Make the library\r
+$(LIBDIR)$(GL_LIB) : $(OBJECTS)\r
+  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)\r
+\r
+clean :\r
+       purge\r
+       delete *.obj;*\r
+\r
+driverfuncs.obj : driverfuncs.c\r

diff --git a/src/mesa/drivers/osmesa/descrip.mms b/src/mesa/drivers/osmesa/descrip.mms
index a00205c731ebdd3f2ec19df2bd8df6e1776be9a5..c273cdf5038c318b4292ebbb7cb8f4b23dcaec46 100644 (file)
--- a/src/mesa/drivers/osmesa/descrip.mms
+++ b/src/mesa/drivers/osmesa/descrip.mms
@@ -1,40 +1,41 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-       define gl [----.include.gl]
-       define math [--.math]
-       define tnl [--.tnl]
-       define swrast [--.swrast]
-       define swrast_setup [--.swrast_setup]
-       define array_cache [--.array_cache]
-
-.include [----]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
-
-SOURCES = osmesa.c
-
-OBJECTS = osmesa.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-       purge
-       delete *.obj;*
-
-osmesa.obj : osmesa.c
+# Makefile for core library for VMS\r
+# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl\r
+# Last revision : 16 June 2003\r
+\r
+.first\r
+       define gl [----.include.gl]\r
+       define math [--.math]\r
+       define tnl [--.tnl]\r
+       define swrast [--.swrast]\r
+       define swrast_setup [--.swrast_setup]\r
+       define array_cache [--.array_cache]\r
+       define drivers [-]\r
+\r
+.include [----]mms-config.\r
+\r
+##### MACROS #####\r
+\r
+VPATH = RCS\r
+\r
+INCDIR = [----.include],[--.main],[--.glapi]\r
+LIBDIR = [----.lib]\r
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)\r
+\r
+SOURCES = osmesa.c\r
+\r
+OBJECTS = osmesa.obj\r
+\r
+##### RULES #####\r
+\r
+VERSION=Mesa V3.4\r
+\r
+##### TARGETS #####\r
+# Make the library\r
+$(LIBDIR)$(GL_LIB) : $(OBJECTS)\r
+  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)\r
+\r
+clean :\r
+       purge\r
+       delete *.obj;*\r
+\r
+osmesa.obj : osmesa.c\r

diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms
index 24c9bde9a03b0bb7bb063da4fc06468f66425e86..a50472d8c70b6db41241cc63b4ffff7797630431 100644 (file)
--- a/src/mesa/drivers/x11/descrip.mms
+++ b/src/mesa/drivers/x11/descrip.mms
@@ -1,49 +1,50 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
-
-.first
-       define gl [----.include.gl]
-       define math [--.math]
-       define tnl [--.tnl]
-       define swrast [--.swrast]
-       define swrast_setup [--.swrast_setup]
-       define array_cache [--.array_cache]
-
-.include [----]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
-
-SOURCES = fakeglx.c glxapi.c xfonts.c xm_api.c xm_dd.c xm_line.c xm_span.c\
-       xm_tri.c
-
-OBJECTS =fakeglx.obj,glxapi.obj,xfonts.obj,xm_api.obj,xm_dd.obj,xm_line.obj,\
-       xm_span.obj,xm_tri.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
-  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
-       purge
-       delete *.obj;*
-
-fakeglx.obj : fakeglx.c
-glxapi.obj : glxapi.c
-xfonts.obj : xfonts.c
-xm_api.obj : xm_api.c
-xm_dd.obj : xm_dd.c
-xm_line.obj : xm_line.c
-xm_span.obj : xm_span.c
-xm_tri.obj : xm_tri.c
+# Makefile for core library for VMS\r
+# contributed by Jouk Jansen  joukj@hrem.stm.tudelft.nl\r
+# Last revision : 16 June 2003\r
+\r
+.first\r
+       define gl [----.include.gl]\r
+       define math [--.math]\r
+       define tnl [--.tnl]\r
+       define swrast [--.swrast]\r
+       define swrast_setup [--.swrast_setup]\r
+       define array_cache [--.array_cache]\r
+       define drivers [-]\r
+\r
+.include [----]mms-config.\r
+\r
+##### MACROS #####\r
+\r
+VPATH = RCS\r
+\r
+INCDIR = [----.include],[--.main],[--.glapi]\r
+LIBDIR = [----.lib]\r
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)\r
+\r
+SOURCES = fakeglx.c glxapi.c xfonts.c xm_api.c xm_dd.c xm_line.c xm_span.c\\r
+       xm_tri.c\r
+\r
+OBJECTS =fakeglx.obj,glxapi.obj,xfonts.obj,xm_api.obj,xm_dd.obj,xm_line.obj,\\r
+       xm_span.obj,xm_tri.obj\r
+\r
+##### RULES #####\r
+\r
+VERSION=Mesa V3.4\r
+\r
+##### TARGETS #####\r
+# Make the library\r
+$(LIBDIR)$(GL_LIB) : $(OBJECTS)\r
+  @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)\r
+\r
+clean :\r
+       purge\r
+       delete *.obj;*\r
+\r
+fakeglx.obj : fakeglx.c\r
+glxapi.obj : glxapi.c\r
+xfonts.obj : xfonts.c\r
+xm_api.obj : xm_api.c\r
+xm_dd.obj : xm_dd.c\r
+xm_line.obj : xm_line.c\r
+xm_span.obj : xm_span.c\r
+xm_tri.obj : xm_tri.c\r