build: use system glproto headers
As pointed out with commit d5bc0866a8
"Check for glproto in
configure.ac" we want to rely on the upstream/distribution provided
package. Thus lets remove the in-tree copy.
Also make sure we use the headers (add the missing CFLAGS).
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
4d977ea389
commit
35ef968cab
|
@ -1,54 +0,0 @@
|
|||
#ifndef _GLX_glxmd_h_
|
||||
#define _GLX_glxmd_h_
|
||||
|
||||
|
||||
/*
|
||||
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
|
||||
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice including the dates of first publication and
|
||||
* either this permission notice or a reference to
|
||||
* http://oss.sgi.com/projects/FreeB/
|
||||
* shall be included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
|
||||
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the name of Silicon Graphics, Inc.
|
||||
* shall not be used in advertising or otherwise to promote the sale, use or
|
||||
* other dealings in this Software without prior written authorization from
|
||||
* Silicon Graphics, Inc.
|
||||
*/
|
||||
|
||||
/*
|
||||
** Machine dependent declarations.
|
||||
*/
|
||||
|
||||
/*
|
||||
** Define floating point wire types. These are in IEEE format on the wire.
|
||||
*/
|
||||
typedef float FLOAT32;
|
||||
typedef double FLOAT64;
|
||||
|
||||
/*
|
||||
** Like B32, but this is used to store floats in a request.
|
||||
**
|
||||
** NOTE: Machines that have a native 32-bit IEEE float can define this as
|
||||
** nothing. Machines that don't might mimic the float with an integer,
|
||||
** and then define this to :32.
|
||||
*/
|
||||
#define F32
|
||||
|
||||
#endif /* _GLX_glxmd_h_ */
|
File diff suppressed because it is too large
Load diff
|
@ -52,6 +52,7 @@ libGLX_la_CFLAGS += -I$(srcdir)/$(GLVND_PTHREAD_DIR)
|
|||
libGLX_la_CFLAGS += -I$(srcdir)/$(GL_DISPATCH_DIR)
|
||||
libGLX_la_CFLAGS += -I$(top_srcdir)/include
|
||||
libGLX_la_CFLAGS += -I$(srcdir)/$(X11GLVND_DIR)
|
||||
libGLX_la_CFLAGS += $(GLPROTO_CFLAGS)
|
||||
|
||||
# Required library flags
|
||||
libGLX_la_CFLAGS += $(PTHREAD_CFLAGS)
|
||||
|
|
Loading…
Reference in a new issue