From b5b5c52034840dbfcd3f76a9e7cde8b379e7d517 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Tue, 22 Aug 2000 13:31:00 +0000 Subject: Committing in . Modified Files: Mesa/include/GL/glx.h Mesa/include/GL/xmesa.h Mesa/src/descrip.mms Mesa/src/X/glxheader.h Mesa/src/X/xfonts.c Mesa/src/X/xfonts.h Mesa/src-glu/descrip.mms Mesa/src-glut/capturexfont.c Mesa/src-glut/descrip.mms Mesa/src-glut/glut_cmap.c Mesa/src-glut/glut_event.c Mesa/src-glut/glut_fullscrn.c Mesa/src-glut/glut_gamemode.c Mesa/src-glut/glut_init.c Mesa/src-glut/glut_input.c Mesa/src-glut/glut_menu.c Mesa/src-glut/glut_menu2.c Mesa/src-glut/glut_overlay.c Mesa/src-glut/glut_win.c Mesa/src-glut/glut_winmisc.c Mesa/src-glut/glutint.h Mesa/src-glut/layerutil.h Mesa/vms/analyze_map.com Added Files: Mesa/include/GL/vms_x_fix.h Patches effective on VMS only. This allows for compiling with /name=(as_is,short). This breaks the binary compatibility with previous versions for VMS, but is the only way to combine Mesa with GTK for VMS. Jouk ---------------------------------------------------------------------- --- src/mesa/drivers/x11/glxheader.h | 5 ++++- src/mesa/drivers/x11/xfonts.c | 5 ++++- src/mesa/drivers/x11/xfonts.h | 5 ++++- src/mesa/main/descrip.mms | 8 ++++---- 4 files changed, 16 insertions(+), 7 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h index 28e53659f0..99a6400aad 100644 --- a/src/mesa/drivers/x11/glxheader.h +++ b/src/mesa/drivers/x11/glxheader.h @@ -1,4 +1,4 @@ -/* $Id: glxheader.h,v 1.1 1999/11/11 01:29:28 brianp Exp $ */ +/* $Id: glxheader.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -28,6 +28,9 @@ #ifndef GLX_HEADER_H #define GLX_HEADER_H +#ifdef __VMS +#include +#endif #ifdef HAVE_CONFIG_H #include "conf.h" diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c index 27b877dbab..e0f457a354 100644 --- a/src/mesa/drivers/x11/xfonts.c +++ b/src/mesa/drivers/x11/xfonts.c @@ -1,4 +1,4 @@ -/* $Id: xfonts.c,v 1.8 2000/08/13 03:57:21 brianp Exp $ */ +/* $Id: xfonts.c,v 1.9 2000/08/22 13:31:04 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -29,6 +29,9 @@ * Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de */ +#ifdef __VMS +#include +#endif #ifdef HAVE_CONFIG_H #include "conf.h" diff --git a/src/mesa/drivers/x11/xfonts.h b/src/mesa/drivers/x11/xfonts.h index 9cbe11f7bb..712c9d4c32 100644 --- a/src/mesa/drivers/x11/xfonts.h +++ b/src/mesa/drivers/x11/xfonts.h @@ -1,4 +1,4 @@ -/* $Id: xfonts.h,v 1.1 2000/04/19 01:44:02 brianp Exp $ */ +/* $Id: xfonts.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -28,6 +28,9 @@ #ifndef XFONTS_H #define XFONTS_H +#ifdef __VMS +#include +#endif #include diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms index 78c3b43480..e532df4c52 100644 --- a/src/mesa/main/descrip.mms +++ b/src/mesa/main/descrip.mms @@ -1,6 +1,6 @@ # Makefile for core library for VMS # contributed by Jouk Jansen joukj@crys.chem.uva.nl -# Last revision : 3 May 1999 +# Last revision : 22 August 2000 .first define gl [-.include.gl] @@ -13,11 +13,11 @@ VPATH = RCS INCDIR = [-.include] LIBDIR = [-.lib] -CFLAGS = /include=($(INCDIR),[])/define=(FBIND=1) +CFLAGS = /include=($(INCDIR),[])/define=(FBIND=1)/name=(as_is,short) CORE_SOURCES = aatriangle.c accum.c alpha.c alphabuf.c attrib.c \ bitmap.c blend.c buffers.c clip.c colortab.c context.c copypix.c depth.c \ -dispatch.c \ +dispatch.c convolve.c \ dlist.c drawpix.c enable.c eval.c feedback.c fog.c \ get.c hash.c hint.c image.c imaging.c light.c lines.c logic.c masking.c matrix.c \ mem.c glapi.c glapinoop.c \ @@ -51,7 +51,7 @@ mmath.obj,pb.obj,pixel.obj,points.obj OBJECTS7=polygon.obj,\ quads.obj,rastpos.obj,readpix.obj,rect.obj,scissor.obj,shade.obj,span.obj,\ -pixeltex.obj +pixeltex.obj,convolve.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 -- cgit v1.2.3