From b5b5c52034840dbfcd3f76a9e7cde8b379e7d517 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Tue, 22 Aug 2000 13:31:00 +0000 Subject: [PATCH] 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 ---------------------------------------------------------------------- --- include/GL/glx.h | 3 ++- include/GL/vms_x_fix.h | 43 ++++++++++++++++++++++++++++++++ include/GL/xmesa.h | 6 +++-- src/glu/mesa/descrip.mms | 2 +- src/glut/glx/capturexfont.c | 4 +++ src/glut/glx/descrip.mms | 2 +- src/glut/glx/glut_cmap.c | 4 +++ src/glut/glx/glut_event.c | 4 +++ src/glut/glx/glut_fullscrn.c | 4 +++ src/glut/glx/glut_gamemode.c | 4 +++ src/glut/glx/glut_init.c | 4 +++ src/glut/glx/glut_input.c | 4 +++ src/glut/glx/glut_menu.c | 4 +++ src/glut/glx/glut_menu2.c | 4 +++ src/glut/glx/glut_overlay.c | 4 +++ src/glut/glx/glut_win.c | 4 +++ src/glut/glx/glut_winmisc.c | 4 +++ src/glut/glx/glutint.h | 4 +++ src/glut/glx/layerutil.h | 4 +++ 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 +++--- 23 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 include/GL/vms_x_fix.h diff --git a/include/GL/glx.h b/include/GL/glx.h index c2ae5d35b95..9082c3dcd10 100644 --- a/include/GL/glx.h +++ b/include/GL/glx.h @@ -1,4 +1,4 @@ -/* $Id: glx.h,v 1.22 2000/06/23 17:39:18 brianp Exp $ */ +/* $Id: glx.h,v 1.23 2000/08/22 13:31:00 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -30,6 +30,7 @@ #ifdef __VMS +#include # ifdef __cplusplus /* VMS Xlib.h gives problems with C++. * this avoids a bunch of trivial warnings */ diff --git a/include/GL/vms_x_fix.h b/include/GL/vms_x_fix.h new file mode 100644 index 00000000000..6e4fb6806b9 --- /dev/null +++ b/include/GL/vms_x_fix.h @@ -0,0 +1,43 @@ +/*************************************************************************** + * * + * Repair definitions of Xlib when compileing with /name=(as_is) on VMS * + * You'll need the PORTING_LIBRARY (get it from Compaq) installed * + * * + * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl) * + * * + * Last revision : 22 August 2000 * + * * + ***************************************************************************/ + +#ifndef VMS_X_FIX +#define VMS_X_FIX + +#ifdef __cplusplus +#define VMS_BEGIN_C_PLUS_PLUS extern "C" { +#define VMS_END_C_PLUS_PLUS } +#else +#define VMS_BEGIN_C_PLUS_PLUS +#define VMS_END_C_PLUS_PLUS +#endif + +#include + +#define XQueryFont XQUERYFONT +#define XSetPlaneMask XSETPLANEMASK +#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL +#define XDestroySubwindows XDESTROYSUBWINDOWS +#define XFreeDeviceList XFREEDEVICELIST +#define XFreeDeviceState XFREEDEVICESTATE +#define XGetExtensionVersion XGETEXTENSIONVERSION +#define XGetRGBColormaps XGETRGBCOLORMAPS +#define XIconifyWindow XICONIFYWINDOW +#define XInstallColormap XINSTALLCOLORMAP +#define XListInputDevices XLISTINPUTDEVICES +#define XLookupKeysym XLOOKUPKEYSYM +#define XOpenDevice XOPENDEVICE +#define XQueryDeviceState XQUERYDEVICESTATE +#define XSelectExtensionEvent XSELECTEXTENSIONEVENT +#define XWarpPointer XWARPPOINTER +#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP + +#endif diff --git a/include/GL/xmesa.h b/include/GL/xmesa.h index 0c50b48c7cd..273b83508c7 100644 --- a/include/GL/xmesa.h +++ b/include/GL/xmesa.h @@ -1,4 +1,4 @@ -/* $Id: xmesa.h,v 1.8 2000/05/02 02:30:01 brianp Exp $ */ +/* $Id: xmesa.h,v 1.9 2000/08/22 13:31:01 joukj Exp $ */ /* * Mesa 3-D graphics library @@ -67,12 +67,14 @@ See the demos/xdemo.c and xmesa1.c files for examples. #ifndef XMESA_H #define XMESA_H +#ifdef __VMS +#include +#endif #ifdef __cplusplus extern "C" { #endif - #ifdef XFree86Server #include "xmesa_xf86.h" #else diff --git a/src/glu/mesa/descrip.mms b/src/glu/mesa/descrip.mms index 5f5334c7419..16a1e615362 100644 --- a/src/glu/mesa/descrip.mms +++ b/src/glu/mesa/descrip.mms @@ -12,7 +12,7 @@ VPATH = RCS INCDIR = $disk2:[-.include] LIBDIR = [-.lib] -CFLAGS = /include=$(INCDIR)/define=(FBIND=1) +CFLAGS = /include=$(INCDIR)/define=(FBIND=1)/name=(as_is,short) SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \ polytest.c project.c quadric.c tess.c tesselat.c diff --git a/src/glut/glx/capturexfont.c b/src/glut/glx/capturexfont.c index 3bed13c9beb..b99e7930564 100644 --- a/src/glut/glx/capturexfont.c +++ b/src/glut/glx/capturexfont.c @@ -10,6 +10,10 @@ encoding the font for GLUT's use. Example usage: capturexfont.c 9x15 glutBitmap9By15 > glut_9x15.c */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/descrip.mms b/src/glut/glx/descrip.mms index e6aeb8352e6..5d59c42db48 100644 --- a/src/glut/glx/descrip.mms +++ b/src/glut/glx/descrip.mms @@ -14,7 +14,7 @@ VPATH = RCS INCDIR = [-.include] LIBDIR = [-.lib] -CFLAGS = /nowarn/include=$(INCDIR)/prefix=all +CFLAGS = /nowarn/include=$(INCDIR)/prefix=all/name=(as_is,short) SOURCES = \ glut_8x13.c \ diff --git a/src/glut/glx/glut_cmap.c b/src/glut/glx/glut_cmap.c index a9d004003f6..1c496ad66da 100644 --- a/src/glut/glx/glut_cmap.c +++ b/src/glut/glx/glut_cmap.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include /* SunOS multithreaded assert() needs . Lame. */ diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c index 6d928af2ea3..f4463dee0b6 100644 --- a/src/glut/glx/glut_event.c +++ b/src/glut/glx/glut_event.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_fullscrn.c b/src/glut/glx/glut_fullscrn.c index 8d58f1743c9..0f1ea10b1be 100644 --- a/src/glut/glx/glut_fullscrn.c +++ b/src/glut/glx/glut_fullscrn.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include /* SunOS multithreaded assert() needs . Lame. */ #include diff --git a/src/glut/glx/glut_gamemode.c b/src/glut/glx/glut_gamemode.c index b685ce33e2a..004f325a061 100644 --- a/src/glut/glx/glut_gamemode.c +++ b/src/glut/glx/glut_gamemode.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_init.c b/src/glut/glx/glut_init.c index b9d2fde3f34..d4d0e8a9783 100644 --- a/src/glut/glx/glut_init.c +++ b/src/glut/glx/glut_init.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_input.c b/src/glut/glx/glut_input.c index bc93d5e5151..d012c5ee16a 100644 --- a/src/glut/glx/glut_input.c +++ b/src/glut/glx/glut_input.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_menu.c b/src/glut/glx/glut_menu.c index 2af3482afc0..0c36d348f46 100644 --- a/src/glut/glx/glut_menu.c +++ b/src/glut/glx/glut_menu.c @@ -9,6 +9,10 @@ the menuing functionality implemented. This file is used only by the X Window System version of GLUT. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_menu2.c b/src/glut/glx/glut_menu2.c index 93119b540e3..d02cee4ac15 100644 --- a/src/glut/glx/glut_menu2.c +++ b/src/glut/glx/glut_menu2.c @@ -12,6 +12,10 @@ the menuing functionality implemented. This file is used only by the X Window System version of GLUT. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_overlay.c b/src/glut/glx/glut_overlay.c index 13ece12a159..cc3c8ced641 100644 --- a/src/glut/glx/glut_overlay.c +++ b/src/glut/glx/glut_overlay.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_win.c b/src/glut/glx/glut_win.c index 883bacb0871..934144f633e 100644 --- a/src/glut/glx/glut_win.c +++ b/src/glut/glx/glut_win.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glut_winmisc.c b/src/glut/glx/glut_winmisc.c index 5a9d199a56e..60d5a073a89 100644 --- a/src/glut/glx/glut_winmisc.c +++ b/src/glut/glx/glut_winmisc.c @@ -5,6 +5,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #include #include #include diff --git a/src/glut/glx/glutint.h b/src/glut/glx/glutint.h index 71dceeceeee..f54ca0bd164 100644 --- a/src/glut/glx/glutint.h +++ b/src/glut/glx/glutint.h @@ -7,6 +7,10 @@ and is provided without guarantee or warrantee expressed or implied. This program is -not- in the public domain. */ +#ifdef __VMS +#include +#endif + #if defined(__CYGWIN32__) #include #endif diff --git a/src/glut/glx/layerutil.h b/src/glut/glx/layerutil.h index 34610774090..8f580afe3b7 100644 --- a/src/glut/glx/layerutil.h +++ b/src/glut/glx/layerutil.h @@ -9,6 +9,10 @@ /* Based on XLayerUtil.h: Revision: 1.3 */ +#ifdef __VMS +#include +#endif + #if !defined(_WIN32) #include #include diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h index 28e53659f00..99a6400aad4 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 27b877dbabe..e0f457a354f 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 9cbe11f7bb2..712c9d4c321 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 78c3b434808..e532df4c528 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 -- 2.30.2