CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/11 03:12:07
Modified files:
. : ChangeLog
gui : Makefile.am
Log message:
* gui/Makefile.am: fix build of sdl/cairo
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3993&r2=1.3994
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.103&r2=1.104
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3993
retrieving revision 1.3994
diff -u -b -r1.3993 -r1.3994
--- ChangeLog 11 Aug 2007 01:44:15 -0000 1.3993
+++ ChangeLog 11 Aug 2007 03:12:06 -0000 1.3994
@@ -1,5 +1,6 @@
2007-08-10 Sandro Santilli <[EMAIL PROTECTED]>
+ * gui/Makefile.am: fix build of sdl/cairo
* configure.ac: abort if a requested renderer/gui combination
isn't supported (checked for gtk/kde/sdl/fb/fltk)
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- gui/Makefile.am 10 Aug 2007 22:53:22 -0000 1.103
+++ gui/Makefile.am 11 Aug 2007 03:12:07 -0000 1.104
@@ -219,26 +219,34 @@
bin_PROGRAMS += sdl-gnash
sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
$(AM_CPPFLAGS) $(SDL_CFLAGS)
-sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp
+sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp sdl.cpp sdlsup.h sdl_glue.h
sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
#sdl_gnash_DEPENDENCIES = .configline
sdl_gnash_LDADD = \
$(MYSQL_LIBS) \
$(GNASH_LIBS) \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS) \
+ $(SDL_LIBS)
+
if BUILD_OGL_RENDERER
sdl_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
sdl_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
- $(SDL_LIBS) $(OPENGL_LIBS)
-sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h \
- sdl.cpp sdlsup.h sdl_glue.h
+ $(OPENGL_LIBS)
+sdl_gnash_SOURCES += sdl_ogl_glue.cpp sdl_ogl_glue.h
endif
+
if BUILD_AGG_RENDERER
sdl_gnash_CPPFLAGS += $(AGG_CFLAGS)
sdl_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
- $(SDL_LIBS) $(AGG_LIBS)
-sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h \
- sdl.cpp sdlsup.h sdl_glue.h
+ $(AGG_LIBS)
+sdl_gnash_SOURCES += sdl_agg_glue.cpp sdl_agg_glue.h
+endif
+
+if BUILD_CAIRO_RENDERER
+sdl_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+sdl_gnash_LDADD += $(top_builddir)/backend/libgnashcairo.la \
+ $(CAIRO_LIBS)
+sdl_gnash_SOURCES += sdl_cairo_glue.cpp sdl_cairo_glue.h
endif
endif
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
