[Gnash-commit] gnash/gui Makefile.am aqua_ogl_glue.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/05/15 22:11:13

Modified files:
        gui            : Makefile.am aqua_ogl_glue.cpp 

Log message:
        fix up for aqua

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- Makefile.am 15 May 2007 22:04:18 -0000      1.71
+++ Makefile.am 15 May 2007 22:11:12 -0000      1.72
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.71 2007/05/15 22:04:18 nihilus Exp $
+# $Id: Makefile.am,v 1.72 2007/05/15 22:11:12 nihilus Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -80,12 +80,12 @@
 endif # USE_GUI_GTK
 if USE_GUI_AQUA
   AQUA_OPENGL_SRCS = aqua_ogl_glue.cpp aqua_ogl_glue.h
-  AM_LDFLAGS += -framework Carbon -framework openGL -framework AGL
+  AM_LDFLAGS += -framework Carbon $(OPENGL_LIBS)
 endif # USE_GUI_AQUA
 if USE_GUI_SDL
   SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
 endif # USE_GUI_SDL
-if USE_GUI_KDE
+Âif USE_GUI_KDE
   KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
   AM_CPPFLAGS += $(KDE_CFLAGS) $(QT_CFLAGS)
   AM_LDFLAGS +=  $(KDE_LIBS) $(QT_LIBS)

Index: aqua_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- aqua_ogl_glue.cpp   15 May 2007 22:04:18 -0000      1.6
+++ aqua_ogl_glue.cpp   15 May 2007 22:11:12 -0000      1.7
@@ -17,13 +17,14 @@
 // 
 //
 
-/* $Id: aqua_ogl_glue.cpp,v 1.6 2007/05/15 22:04:18 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.cpp,v 1.7 2007/05/15 22:11:12 nihilus Exp $ */
 
 
 #include "aqua_ogl_glue.h"
 #include <AGL/agl.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
 #include "log.h"
 
 #define OVERSIZE 1.0f