[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r12173: Fix building script for sing
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r12173: Fix building script for singular renderers (sounds like a dejavu) |
Date: |
Sat, 01 May 2010 12:37:25 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 12173
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-01 12:37:25 +0200
message:
Fix building script for singular renderers (sounds like a dejavu)
modified:
gui/am-frag/gtk.am
=== modified file 'gui/am-frag/gtk.am'
--- a/gui/am-frag/gtk.am 2010-03-11 03:27:57 +0000
+++ b/gui/am-frag/gtk.am 2010-05-01 10:37:25 +0000
@@ -23,10 +23,12 @@
if BUILD_GTK_GUI
bin_PROGRAMS += gtk-gnash
+
if BUILD_ALP_GUI
GTK_CFLAGS += -DALP_BUILD=ALP_BUILD_DEBUG
endif
-gtk_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+
+gtk_gnash_SOURCES = $(GUI_SRCS) $(GTK_CANVAS) gtk.cpp gtksup.h gtk_glue.h
gui_gtk.cpp
gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
$(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
@@ -34,16 +36,14 @@
if BUILD_OGL_RENDERER
gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
- gtk.cpp gtksup.h gtk_glue.h $(GTK_CANVAS)
+gtk_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
$(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS)
endif # BUILD_OGL_RENDERER
if BUILD_AGG_RENDERER
gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
- gtksup.h gtk_glue.h # $(GTK_CANVAS)
+gtk_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h
gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
$(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
if HAVE_XV
@@ -66,10 +66,10 @@
$(NULL)
endif # USE_VAAPI
endif # BUILD_AGG_RENDERER
+
if BUILD_CAIRO_RENDERER
gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
- gtksup.h gtk_glue.h # $(GTK_CANVAS)
+gtk_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h
gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
$(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
endif # BUILD_CAIRO_RENDERER
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r12173: Fix building script for singular renderers (sounds like a dejavu),
Sandro Santilli <=