[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnash-dev] error building current CVS when no GL is available
From: |
strk |
Subject: |
Re: [Gnash-dev] error building current CVS when no GL is available |
Date: |
Wed, 26 Jul 2006 19:01:21 +0200 |
On Wed, Jul 26, 2006 at 04:05:35PM +0200, Hannes Mayr wrote:
> 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:
We shouldn't need to wrap ogl.h in the check: INCLUDES should
be harmless.
Also, if we don't list .cpp files in SOURCES we should list them in EXTRA_DIST,
or they won't be included in distribution.
--strk;
> 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
>
>
>
> _______________________________________________
> Gnash-dev mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash-dev
--
/"\ ASCII Ribbon Campaign
\ / Respect for low technology.
X Keep e-mail messages readable by any computer system.
/ \ Keep it ASCII.