diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-03-10 21:26:13 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-03-10 21:28:47 +0100 |
| commit | 0230541af5e5cebf7bdec97d8d86cd594e9ae8b9 (patch) | |
| tree | 40efc9c4d5ea28748edeef40108a579b822f74f3 | |
| parent | eccbe9bb1ac99acc046d6f5ec99761725c05b966 (diff) | |
| download | spice-0230541af5e5cebf7bdec97d8d86cd594e9ae8b9.tar.gz spice-0230541af5e5cebf7bdec97d8d86cd594e9ae8b9.tar.xz spice-0230541af5e5cebf7bdec97d8d86cd594e9ae8b9.zip | |
Define GL_GLEXT_PROTOTYPES in CFLAGS not in random places in the source
| -rw-r--r-- | client/display_channel.cpp | 2 | ||||
| -rw-r--r-- | client/gl_canvas.cpp | 1 | ||||
| -rw-r--r-- | client/glc.cpp | 1 | ||||
| -rw-r--r-- | client/x11/pixels_source_p.h | 1 | ||||
| -rw-r--r-- | client/x11/red_drawable.cpp | 1 | ||||
| -rw-r--r-- | client/x11/red_pixmap_gl.cpp | 2 | ||||
| -rw-r--r-- | client/x11/red_window.cpp | 1 | ||||
| -rw-r--r-- | common/glc.c | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
9 files changed, 2 insertions, 11 deletions
diff --git a/client/display_channel.cpp b/client/display_channel.cpp index a60832aa..60e22fc1 100644 --- a/client/display_channel.cpp +++ b/client/display_channel.cpp @@ -15,8 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define GL_GLEXT_PROTOTYPES - #include "common.h" #include "canvas.h" #include "red_pixmap.h" diff --git a/client/gl_canvas.cpp b/client/gl_canvas.cpp index e66be864..bce74b7b 100644 --- a/client/gl_canvas.cpp +++ b/client/gl_canvas.cpp @@ -15,7 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define GL_GLEXT_PROTOTYPES #include "common.h" #include "../common/gl_canvas.c" diff --git a/client/glc.cpp b/client/glc.cpp index 5a8e5990..1600a6b3 100644 --- a/client/glc.cpp +++ b/client/glc.cpp @@ -15,7 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define GL_GLEXT_PROTOTYPES #include "common.h" #include "../common/glc.c" diff --git a/client/x11/pixels_source_p.h b/client/x11/pixels_source_p.h index 9605ae43..4166f4d6 100644 --- a/client/x11/pixels_source_p.h +++ b/client/x11/pixels_source_p.h @@ -18,7 +18,6 @@ #ifndef _H_PIXELE_SOURSR_P #define _H_PIXELE_SOURSR_P -#define GL_GLEXT_PROTOTYPES #include <X11/X.h> #include <GL/glu.h> #include <X11/extensions/XShm.h> diff --git a/client/x11/red_drawable.cpp b/client/x11/red_drawable.cpp index e020b845..ec6ad53c 100644 --- a/client/x11/red_drawable.cpp +++ b/client/x11/red_drawable.cpp @@ -15,7 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define GL_GLEXT_PROTOTYPES #include "common.h" #include "red_drawable.h" #include "pixels_source_p.h" diff --git a/client/x11/red_pixmap_gl.cpp b/client/x11/red_pixmap_gl.cpp index 3ed5f73c..7644f151 100644 --- a/client/x11/red_pixmap_gl.cpp +++ b/client/x11/red_pixmap_gl.cpp @@ -15,8 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define GL_GLEXT_PROTOTYPES - #include <GL/gl.h> #include <GL/glu.h> #include <GL/glext.h> diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp index a38f7db6..9a0423a9 100644 --- a/client/x11/red_window.cpp +++ b/client/x11/red_window.cpp @@ -15,7 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define GL_GLEXT_PROTOTYPES #include "common.h" #include <X11/Xlib.h> #include <X11/Xresource.h> diff --git a/common/glc.c b/common/glc.c index 770da320..2d71c42c 100644 --- a/common/glc.c +++ b/common/glc.c @@ -18,8 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#define GL_GLEXT_PROTOTYPES - #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/configure.ac b/configure.ac index 8b289006..6f560682 100644 --- a/configure.ac +++ b/configure.ac @@ -164,11 +164,13 @@ SPICE_REQUIRES+=" openssl" have_gl=yes AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", have_gl=no) AC_CHECK_LIB(GLU, gluSphere, GL_LIBS="$GL_LIBS -lGLU", have_gl=no) +GL_CFLAGS="-DGL_GLEXT_PROTOTYPES" if test "x$have_gl" = "xno"; then AC_MSG_ERROR([GL libraries not available]) fi +AC_SUBST(GL_CFLAGS) AC_SUBST(GL_LIBS) SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS" |