From c20b946b4abe2aeccfdb85e54f38e65041948741 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 20 Feb 2017 12:54:14 +0100 Subject: Mesa subtree: Adapt build process for building against Mesa that gets pulled in via git subtree. --- nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h | 5 ++++ nx-X11/programs/Xserver/GL/include/GL/xf86glx.h | 1 + .../programs/Xserver/GL/mesa/main/WSDrawBuffer.h | 27 ++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h create mode 100644 nx-X11/programs/Xserver/GL/include/GL/xf86glx.h create mode 100644 nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h new file mode 100644 index 000000000..2f7cff193 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h @@ -0,0 +1,5 @@ +/* no-op file to make current Mesa happy */ + +#ifndef _glx_ansic_h_ +#define _glx_ansic_h_ +#endif diff --git a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h new file mode 100644 index 000000000..5ddc70a15 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h @@ -0,0 +1 @@ +/* no-op file to make current Mesa happy */ diff --git a/nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h b/nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h new file mode 100644 index 000000000..bf6ea040c --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h @@ -0,0 +1,27 @@ +/**************************************************************************/ +/* */ +/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ +/* Copyright (c) 2008-2014 Oleksandr Shneyder */ +/* Copyright (c) 2011-2016 Mike Gabriel */ +/* Copyright (c) 2014-2016 Mihai Moldovan */ +/* Copyright (c) 2014-2016 Ulrich Sibiller */ +/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ +/* */ +/* NXAGENT, NX protocol compression and NX extensions to this software */ +/* are copyright of the aforementioned persons and companies. */ +/* */ +/* Redistribution and use of the present software is allowed according */ +/* to terms specified in the file LICENSE which comes in the source */ +/* distribution. */ +/* */ +/* All rights reserved. */ +/* */ +/**************************************************************************/ + +typedef struct _WSDrawBufferRec { + GLframebuffer *DrawBuffer; + struct _WSDrawBufferRec *next; +} WSDrawBufferRec, *WSDrawBufferPtr; + +WSDrawBufferPtr pWSDrawBuffer; + -- cgit v1.2.3