[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Makefile.am [release_0_7_2]
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog gui/Makefile.am [release_0_7_2] |
Date: |
Thu, 02 Nov 2006 08:58:52 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Sandro Santilli <strk> 06/11/02 08:58:51
Modified files:
. : ChangeLog
gui : Makefile.am
Log message:
* gui/Makefile.am: always use GTK2_LIBS and GTK2_CFLAGS if USE_GUI_GTK
is set (reguardless of renderer choosen).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.42&r2=1.1412.2.43
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.39.2.3&r2=1.39.2.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.42
retrieving revision 1.1412.2.43
diff -u -b -r1.1412.2.42 -r1.1412.2.43
--- ChangeLog 2 Nov 2006 08:13:35 -0000 1.1412.2.42
+++ ChangeLog 2 Nov 2006 08:58:51 -0000 1.1412.2.43
@@ -1,3 +1,8 @@
+2006-11-02 Sandro Santilli <address@hidden>
+
+ * gui/Makefile.am: always use GTK2_LIBS and GTK2_CFLAGS if USE_GUI_GTK
+ is set (reguardless of renderer choosen).
+
2006-11-02 Hiroyuki Ikezoe <address@hidden>
* backend/sound_handler_gst.cpp: segfault fix (bug #18167)
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.39.2.3
retrieving revision 1.39.2.4
diff -u -b -r1.39.2.3 -r1.39.2.4
--- gui/Makefile.am 2 Nov 2006 00:09:57 -0000 1.39.2.3
+++ gui/Makefile.am 2 Nov 2006 08:58:51 -0000 1.39.2.4
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.39.2.3 2006/11/02 00:09:57 rsavoye Exp $
+# $Id: Makefile.am,v 1.39.2.4 2006/11/02 08:58:51 strk Exp $
AUTOMAKE_OPTIONS =
@@ -49,88 +49,90 @@
$(NULL)
-if USE_RENDERER_OPENGL
+if USE_RENDERER_OPENGL # {
INCLUDES += $(OPENGL_CFLAGS)
-if USE_GUI_GTK
-if HAVE_GLEXT
+if USE_GUI_GTK # {
+if HAVE_GLEXT # {
AM_LDFLAGS += $(GLEXT_LIBS)
INCLUDES += $(GLEXT_CFLAGS)
GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
-endif # HAVE_GLEXT
-endif # USE_GUI_GTK
-if USE_GUI_SDL
+endif # HAVE_GLEXT }
+endif # USE_GUI_GTK }
+if USE_GUI_SDL # {
SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
-endif # USE_GUI_SDL
-if USE_GUI_KDE
+endif # USE_GUI_SDL }
+if USE_GUI_KDE #{
KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
AM_LDFLAGS += \
$(KDE_LIBS) \
$(LIB_KDECORE) \
$(LIB_KDEUI)
BUILT_SOURCES = klash.moc
-endif # USE_GUI_KDE
-else # ! USE_RENDERER_OPENGL
+endif # USE_GUI_KDE }
+else # ! USE_RENDERER_OPENGL }{
GTK_OPENGL_SRCS =
KDE_OPENGL_SRCS =
SDL_OPENGL_SRCS =
-endif # ! USE_RENDERER_OPENGL
+endif # ! USE_RENDERER_OPENGL }
-if USE_RENDERER_CAIRO
+if USE_RENDERER_CAIRO # {
INCLUDES += $(CAIRO_CFLAGS)
AM_LDFLAGS += $(CAIRO_LIBS)
GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h
KDE_CAIRO_SRCS = #kde_glue_cairo.cpp kde_glue_cairo.h
SDL_CAIRO_SRCS = sdl_cairo_glue.cpp sdl_cairo_glue.h
-else
+else # }{
GTK_CAIRO_SRCS =
KDE_CAIRO_SRCS =
SDL_CAIRO_SRCS =
-endif
+endif #}
-if USE_RENDERER_AGG
+if USE_RENDERER_AGG # {
INCLUDES += $(AGG_CFLAGS)
AM_LDFLAGS += $(AGG_LIBS)
GTK_AGG_SRCS = gtk_glue_agg.cpp gtk_glue_agg.h
SDL_AGG_SRCS = sdl_agg_glue.cpp sdl_agg_glue.h
-else
+else # }{
GTK_AGG_SRCS =
SDL_AGG_SRCS =
-endif
+endif # }
-if USE_GUI_GTK
-if USE_RENDERER_OPENGL
-if HAVE_GLEXT
- GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
$(GTK_AGG_SRCS)
+if USE_GUI_GTK #{
AM_LDFLAGS += $(GTK2_LIBS)
INCLUDES += $(GTK2_CFLAGS)
-else
+ GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
$(GTK_AGG_SRCS)
+if USE_RENDERER_OPENGL #{
+if HAVE_GLEXT #{
+ :
+else # }{
+ # shouldn't we handle this in ./configure.ac instead ?
echo "ERROR: You need to install GtkGLExt to use OpenGL with GTK2!"
exit
-endif
-endif
-else
- GTK_SRCS =
-endif
+endif # }
+endif # }
+else # }{
+ GTK_SRCS = cippa.cpp
+endif # }
-if USE_GUI_SDL
+if USE_GUI_SDL # {
SDL_SRCS = sdl.cpp sdlsup.h sdl_glue.h $(SDL_CAIRO_SRCS) $(SDL_OPENGL_SRCS)
$(SDL_AGG_SRCS)
-else
+else # }{
SDL_SRCS =
-endif
+endif # }
-if USE_GUI_KDE
+if USE_GUI_KDE # {
KDE_SRCS = kde.cpp kdesup.h kde_glue.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
INCLUDES += -I$(kde_includes)/kio $(all_includes)
-else
+else # }{
KDE_SRCS =
-endif
+endif # }
-if USE_GUI_FB
+if USE_GUI_FB # {
FB_SRCS = fb.cpp fbsup.h
INCLUDES += $(AGG_CFLAGS)
-else
+else # }{
FB_SRCS =
-endif
+endif # }
if USE_SOUND_SDL
if USE_FFMPEG_ENGINE
- [Gnash-commit] gnash ChangeLog gui/Makefile.am [release_0_7_2],
Sandro Santilli <=