[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/Makefile.am [release_0_8_1]
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog gui/Makefile.am [release_0_8_1] |
Date: |
Sat, 11 Aug 2007 03:12:15 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_8_1
Changes by: Sandro Santilli <strk> 07/08/11 03:12:15
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&only_with_tag=release_0_8_1&r1=1.3971.2.16&r2=1.3971.2.17
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.102.2.1&r2=1.102.2.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.16
retrieving revision 1.3971.2.17
diff -u -b -r1.3971.2.16 -r1.3971.2.17
--- ChangeLog 11 Aug 2007 01:43:43 -0000 1.3971.2.16
+++ ChangeLog 11 Aug 2007 03:12:14 -0000 1.3971.2.17
@@ -1,5 +1,6 @@
2007-08-10 Sandro Santilli <address@hidden>
+ * 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.102.2.1
retrieving revision 1.102.2.2
diff -u -b -r1.102.2.1 -r1.102.2.2
--- gui/Makefile.am 10 Aug 2007 22:53:15 -0000 1.102.2.1
+++ gui/Makefile.am 11 Aug 2007 03:12:15 -0000 1.102.2.2
@@ -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