Re: [Gnash-dev] error building current CVS when no GL is available

[Hannes Mayr]

Bastiaan Jacques wrote:
> On Wednesday 26 July 2006 13:13, strk wrote:
> > In file included from /usr/src/gnash/gnash/libbase/ogl.h:12,
> >                  from /usr/src/gnash/gnash/libbase/ogl.cpp:10:
> > /usr/src/gnash/gnash/libbase/tu_opengl_includes.h:56:21: error:
> > GL/glu.h: No such file or directory
>
> I had the same problem yesterday, and I fixed it with this:

tu_file_SDL.cpp should also be replace with $(SDL_FILE). Here my 
modified patch:

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.30
diff -p -u -r1.30 Makefile.am
--- Makefile.am 7 Jun 2006 03:03:22 -0000       1.30
+++ Makefile.am 26 Jul 2006 14:02:37 -0000
@@ -65,6 +65,14 @@ if DMALLOC
 DMALLOC_FILE = dlmalloc.c
 endif

+if USE_RENDERER_OPENGL
+OPENGL_SOURCES = ogl.cpp
+endif
+
+if HAS_SDL
+SDL_FILE = tu_file_SDL.cpp
+endif
+
 libgnashbase_la_SOURCES = \
        config.cpp \
        container.cpp \
@@ -72,15 +80,15 @@ libgnashbase_la_SOURCES = \
        image.cpp \
        image_filters.cpp \
        jpeg.cpp \
-       log.cpp \
+       log.cpp \
+       $(OPENGL_SOURCES) \
        membuf.cpp \
-       ogl.cpp \
        postscript.cpp \
        rc.cpp \
        triangulate_float.cpp \
        triangulate_sint32.cpp \
        tu_file.cpp \
-       tu_file_SDL.cpp \
+       $(SDL_FILE) \
        tu_random.cpp \
        tu_timer.cpp \
        tu_types.cpp \
@@ -97,6 +105,10 @@ libgnashbase_la_LIBADD = \
        $(SDL_LIBS)
 #      $(OPENGL_LIBS)

+if USE_RENDERER_OPENGL
+OPENGL_HEADER = ogl.h
+endif
+
 noinst_HEADERS = \
        container.h \
        demo.h \
@@ -106,7 +118,7 @@ noinst_HEADERS = \
        image.h \
        jpeg.h \
        membuf.h \
-       ogl.h \
+       $(OPENGL_HEADER) \
        log.h \
        postscript.h \
        rc.h \


Hannes