summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2021-06-24 13:18:35 -0700
committerMatt Turner <mattst88@gmail.com>2021-06-24 13:27:56 -0700
commita172e0aec8f537f365078dab5486cae9c9a6880e (patch)
tree63a7709e0b5695917530f6eddc2391d3b558907d
parentfb5ded2fcfb5c3287b3be1810331577098bd291c (diff)
downloadglu-a172e0aec8f537f365078dab5486cae9c9a6880e.tar.gz
Remove glu_mangle.h
Long ago when GLU lived in the Mesa repository, there was "name mangling" support that allowed you to build Mesa and GLU with all exported symbols' names "mangled". That is, the symbol names would typically be prefixed with an 'm' so that they would not collide with the system's OpenGL implementation. When GLU was split out into its own repository in 2012 we didn't bring over the name mangling support. No one has noticed this lack of functionality since, to my knowledge. Remove the name mangling header (which was unexpectedly licensed under the GPL).
-rw-r--r--Makefile.am4
-rw-r--r--include/GL/glu.h4
-rw-r--r--include/GL/glu_mangle.h86
-rw-r--r--meson.build3
4 files changed, 2 insertions, 95 deletions
diff --git a/Makefile.am b/Makefile.am
index cb1bef9..9a26249 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,7 @@ AM_CXXFLAGS = $(GL_CFLAGS) $(LIBGLVND_CFLAGS) $(OSMESA_CFLAGS) $(WARNCXXFLAGS) $
GL_includedir = $(includedir)/GL
GL_include_HEADERS = \
- $(top_srcdir)/include/GL/glu.h \
- $(top_srcdir)/include/GL/glu_mangle.h
+ $(top_srcdir)/include/GL/glu.h
GLU_LIBRARY_VERSION=1:3:1
lib_LTLIBRARIES = libGLU.la
@@ -137,7 +136,6 @@ EXTRA_DIST = \
meson.build \
meson_options.txt \
include/GL/glu.h \
- include/GL/glu_mangle.h \
src/meson.build \
src/libtess/render.h \
src/libtess/tessmono.h \
diff --git a/include/GL/glu.h b/include/GL/glu.h
index ba2228d..421f25d 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -31,10 +31,6 @@
#ifndef __glu_h__
#define __glu_h__
-#if defined(USE_MGL_NAMESPACE)
-#include "glu_mangle.h"
-#endif
-
#include <GL/gl.h>
#ifndef GLAPIENTRY
diff --git a/include/GL/glu_mangle.h b/include/GL/glu_mangle.h
deleted file mode 100644
index 9c25aa8..0000000
--- a/include/GL/glu_mangle.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version: 3.0
- * Copyright (C) 1995-1998 Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef GLU_MANGLE_H
-#define GLU_MANGLE_H
-
-
-#define gluLookAt mgluLookAt
-#define gluOrtho2D mgluOrtho2D
-#define gluPerspective mgluPerspective
-#define gluPickMatrix mgluPickMatrix
-#define gluProject mgluProject
-#define gluUnProject mgluUnProject
-#define gluErrorString mgluErrorString
-#define gluScaleImage mgluScaleImage
-#define gluBuild1DMipmaps mgluBuild1DMipmaps
-#define gluBuild2DMipmaps mgluBuild2DMipmaps
-#define gluNewQuadric mgluNewQuadric
-#define gluDeleteQuadric mgluDeleteQuadric
-#define gluQuadricDrawStyle mgluQuadricDrawStyle
-#define gluQuadricOrientation mgluQuadricOrientation
-#define gluQuadricNormals mgluQuadricNormals
-#define gluQuadricTexture mgluQuadricTexture
-#define gluQuadricCallback mgluQuadricCallback
-#define gluCylinder mgluCylinder
-#define gluSphere mgluSphere
-#define gluDisk mgluDisk
-#define gluPartialDisk mgluPartialDisk
-#define gluNewNurbsRenderer mgluNewNurbsRenderer
-#define gluDeleteNurbsRenderer mgluDeleteNurbsRenderer
-#define gluLoadSamplingMatrices mgluLoadSamplingMatrices
-#define gluNurbsProperty mgluNurbsProperty
-#define gluGetNurbsProperty mgluGetNurbsProperty
-#define gluBeginCurve mgluBeginCurve
-#define gluEndCurve mgluEndCurve
-#define gluNurbsCurve mgluNurbsCurve
-#define gluBeginSurface mgluBeginSurface
-#define gluEndSurface mgluEndSurface
-#define gluNurbsSurface mgluNurbsSurface
-#define gluBeginTrim mgluBeginTrim
-#define gluEndTrim mgluEndTrim
-#define gluPwlCurve mgluPwlCurve
-#define gluNurbsCallback mgluNurbsCallback
-#define gluNewTess mgluNewTess
-#define gluDeleteTess mgluDeleteTess
-#define gluTessBeginPolygon mgluTessBeginPolygon
-#define gluTessBeginContour mgluTessBeginContour
-#define gluTessVertex mgluTessVertex
-#define gluTessEndPolygon mgluTessEndPolygon
-#define gluTessEndContour mgluTessEndContour
-#define gluTessProperty mgluTessProperty
-#define gluTessNormal mgluTessNormal
-#define gluTessCallback mgluTessCallback
-#define gluGetTessProperty mgluGetTessProperty
-#define gluBeginPolygon mgluBeginPolygon
-#define gluNextContour mgluNextContour
-#define gluEndPolygon mgluEndPolygon
-#define gluGetString mgluGetString
-#define gluBuild1DMipmapLevels mgluBuild1DMipmapLevels
-#define gluBuild2DMipmapLevels mgluBuild2DMipmapLevels
-#define gluBuild3DMipmapLevels mgluBuild3DMipmapLevels
-#define gluBuild3DMipmaps mgluBuild3DMipmaps
-#define gluCheckExtension mgluCheckExtension
-#define gluUnProject4 mgluUnProject4
-#define gluNurbsCallbackData mgluNurbsCallbackData
-#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
-
-#endif
diff --git a/meson.build b/meson.build
index c0de7b6..c84dfc0 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
['c', 'cpp'],
version : '9.0.1',
meson_version : '>= 0.52.0',
- license : 'SGI-B-1.1 AND SGI-B-2.0 AND MIT AND GPL-2.0-or-later',
+ license : 'SGI-B-1.1 AND SGI-B-2.0 AND MIT',
default_options : ['default_library=both', 'b_ndebug=if-release']
)
@@ -25,7 +25,6 @@ inc_include = include_directories('include')
subdir('src')
install_headers(
- 'include/GL/glu_mangle.h',
'include/GL/glu.h',
subdir : 'GL',
)