gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] /srv/bzr/gnash/trunk r10809: Add python libs when buildin


From: rob
Subject: [Gnash-commit] /srv/bzr/gnash/trunk r10809: Add python libs when building all executables for --enable-python. Add aso4 gui option.
Date: Mon, 20 Apr 2009 10:24:55 -0600
User-agent: Bazaar (1.5)

------------------------------------------------------------
revno: 10809
committer: address@hidden
branch nick: trunk
timestamp: Mon 2009-04-20 10:24:55 -0600
message:
  Add python libs when building all executables for --enable-python. Add aso4 
gui option.
added:
  gui/am-frag/aos4.am
modified:
  Makefile.am
  configure.ac
  gui/Makefile.am
  utilities/Makefile.am
=== modified file 'Makefile.am'
--- a/Makefile.am       2009-04-16 22:16:49 +0000
+++ b/Makefile.am       2009-04-20 16:24:55 +0000
@@ -158,7 +158,8 @@
            echo "Using existing bzrversion.h"; \
        else \
            echo "Generating bzrversion.h"; \
-           echo 'static const char *BRANCH_REVNO  = "$(NOW)";\nstatic const 
char *BRANCH_NICK = "none";\n' > bzrversion.h; \
+           now=`date "+%Y%m%d"`; \
+           echo 'static const char *BRANCH_REVNO  = "$${now}";\nstatic const 
char *BRANCH_NICK = "none";\n' > bzrversion.h; \
          fi; \
        fi
 

=== modified file 'configure.ac'
--- a/configure.ac      2009-04-16 00:11:19 +0000
+++ b/configure.ac      2009-04-20 16:24:55 +0000
@@ -460,6 +460,7 @@
 
 has_gtk2=no                     dnl FIXME: has_* shouldn't be in configure but 
in a macro
 
+build_aos4=no                   dnl AmigaOS4 GUI
 build_kde3=no
 build_kde4=no
 build_qtopia3=no
@@ -467,13 +468,13 @@
 build_gtk=no
 build_qt3=no
 build_qt4=no
-build_fb=no
+build_fb=no                     dnl Raw framebuffer
 build_fltk=no
 build_sdl=no
-build_riscos=no
-build_aqua=no
-build_hildon=no
-build_alp=no
+build_riscos=no                 dnl Native OS2 GUI
+build_aqua=no                   dnl Native MacOSX
+build_hildon=no                 dnl Native LIMO
+build_alp=no                    dnl Acess Linux Platform using Hiker
 build_dump=no
 AC_ARG_ENABLE(gui,
   AC_HELP_STRING([--enable-gui=], [Use the specified GUI toolkit 
(default=gtk,kde3)]),
@@ -535,6 +536,9 @@
       fb|FB)
         build_fb=yes
         ;;
+      aos4|AOS4)
+        build_aos4=yes
+        ;;
       dump|DUMP)
         build_dump=yes
         ;;
@@ -552,7 +556,7 @@
 dnl        build_alp=yes
 dnl        build_riscos=yes
         ;;
-      *) AC_MSG_ERROR([invalid gui ${enableval} given (accept: 
gtk|kde3|kde4|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia3|qtopia4|dump)])
+      *) AC_MSG_ERROR([invalid gui ${enableval} given (accept: 
gtk|kde3|kde4|fltk|sdl|riscos|aqua|fb|hildon|alp|qtopia3|qtopia4|dump|aos4)])
          ;;
       esac]
     enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -1736,22 +1740,23 @@
   AC_MSG_WARN(["Enabled KPARTS 4.x plugin, but you aren't building a KDE 4.x 
based GUI!"])
 fi
 
-AM_CONDITIONAL(BUILD_QTOPIA3_GUI, [ test x$build_qtopia3 = xyes ])
-AM_CONDITIONAL(BUILD_QTOPIA4_GUI, [ test x$build_qtopia4 = xyes ])
-AM_CONDITIONAL(BUILD_QT3_GUI,     [ test x$build_qt3 = xyes ])
-AM_CONDITIONAL(BUILD_QT4_GUI,     [ test x$build_qt4 = xyes ])
-AM_CONDITIONAL(BUILD_KDE3_GUI,    [ test x$build_kde3 = xyes ])
-AM_CONDITIONAL(BUILD_KDE4_GUI,    [ test x$build_kde4 = xyes ])
+AM_CONDITIONAL(BUILD_QTOPIA3_GUI,  [ test x$build_qtopia3 = xyes ])
+AM_CONDITIONAL(BUILD_QTOPIA4_GUI,  [ test x$build_qtopia4 = xyes ])
+AM_CONDITIONAL(BUILD_QT3_GUI,      [ test x$build_qt3 = xyes ])
+AM_CONDITIONAL(BUILD_QT4_GUI,      [ test x$build_qt4 = xyes ])
+AM_CONDITIONAL(BUILD_KDE3_GUI,     [ test x$build_kde3 = xyes ])
+AM_CONDITIONAL(BUILD_KDE4_GUI,     [ test x$build_kde4 = xyes ])
 
-AM_CONDITIONAL(BUILD_ALP_GUI,     [ test x$build_alp = xyes ])
-AM_CONDITIONAL(BUILD_HILDON_GUI,  [ test x$build_hildon = xyes ])
-AM_CONDITIONAL(BUILD_GTK_GUI,     [ test x$build_gtk = xyes ])
-AM_CONDITIONAL(BUILD_FLTK_GUI,    [ test x$build_fltk = xyes ])
-AM_CONDITIONAL(BUILD_SDL_GUI,     [ test x$build_sdl = xyes ])
-AM_CONDITIONAL(BUILD_FB_GUI,      [ test x$build_fb = xyes ])
-AM_CONDITIONAL(BUILD_AQUA_GUI,    [ test x$build_aqua = xyes ])
-AM_CONDITIONAL(BUILD_RISCOS_GUI,  [ test x$build_riscos = xyes ])
-AM_CONDITIONAL(BUILD_DUMP_GUI,    [ test x$build_dump = xyes ])
+AM_CONDITIONAL(BUILD_ALP_GUI,      [ test x$build_alp = xyes ])
+AM_CONDITIONAL(BUILD_HILDON_GUI,   [ test x$build_hildon = xyes ])
+AM_CONDITIONAL(BUILD_GTK_GUI,      [ test x$build_gtk = xyes ])
+AM_CONDITIONAL(BUILD_FLTK_GUI,     [ test x$build_fltk = xyes ])
+AM_CONDITIONAL(BUILD_SDL_GUI,      [ test x$build_sdl = xyes ])
+AM_CONDITIONAL(BUILD_FB_GUI,       [ test x$build_fb = xyes ])
+AM_CONDITIONAL(BUILD_AQUA_GUI,     [ test x$build_aqua = xyes ])
+AM_CONDITIONAL(BUILD_RISCOS_GUI,   [ test x$build_riscos = xyes ])
+AM_CONDITIONAL(BUILD_DUMP_GUI,     [ test x$build_dump = xyes ])
+AM_CONDITIONAL(BUILD_AMIGAOS4_GUI, [ test x$build_aos4 = xyes ])
 
 # plugin building flags
 AM_CONDITIONAL(NPAPI, [test x$npapi = xyes])

=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am   2009-04-06 20:29:42 +0000
+++ b/gui/Makefile.am   2009-04-20 16:24:55 +0000
@@ -52,6 +52,7 @@
        -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
        $(LIRC_CFLAGS) \
        $(BOOST_CFLAGS) \
+       $(PYTHON_LIBS) \
        $(PTHREAD_CFLAGS) \
        $(NULL)
 
@@ -200,6 +201,11 @@
 include $(srcdir)/am-frag/sdl.am
 endif
 
+# Build the AmigaOS4 gui
+if BUILD_AMIGAOS4_GUI
+include $(srcdir)/am-frag/aos4.am
+endif
+
 # Build the FLTK gui
 if BUILD_FLTK_GUI
 include $(srcdir)/am-frag/fltk.am

=== added file 'gui/am-frag/aos4.am'
--- a/gui/am-frag/aos4.am       1970-01-01 00:00:00 +0000
+++ b/gui/am-frag/aos4.am       2009-04-20 16:24:55 +0000
@@ -0,0 +1,54 @@
+# 
+#   Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 
+
+#
+# Build the AOS4 gui
+#
+if BUILD_AMIGAOS4_GUI
+bin_PROGRAMS += aos4-gnash
+aos4_gnash_CPPFLAGS = -DGUI_AOS4 -DGUI_CONFIG=\"AOS4\" \
+        $(AM_CPPFLAGS) $(AOS4_CFLAGS) 
+aos4_gnash_SOURCES = $(GUI_SRCS) gui_aos4.cpp aos4.cpp aos4sup.h aos4_glue.h
+aos4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
+#aos4_gnash_DEPENDENCIES = .configline
+aos4_gnash_LDADD = \
+       $(MYSQL_LIBS) \
+       $(GNASH_LIBS) \
+       $(AM_LDFLAGS) \
+       $(AOS4_LIBS)
+
+if BUILD_OGL_RENDERER
+aos4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+aos4_gnash_LDADD += $(top_builddir)/backend/libgnashogl.la \
+       $(OPENGL_LIBS)
+aos4_gnash_SOURCES += aos4_ogl_glue.cpp aos4_ogl_glue.h 
+endif
+
+if BUILD_AGG_RENDERER
+aos4_gnash_CPPFLAGS += $(AGG_CFLAGS)
+aos4_gnash_LDADD += $(top_builddir)/backend/libgnashagg.la \
+       $(AGG_LIBS)
+aos4_gnash_SOURCES += aos4_agg_glue.cpp aos4_agg_glue.h 
+endif
+
+if BUILD_CAIRO_RENDERER
+aos4_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+aos4_gnash_LDADD += $(top_builddir)/backend/libgnashcairo.la \
+       $(CAIRO_LIBS) 
+aos4_gnash_SOURCES += aos4_cairo_glue.cpp aos4_cairo_glue.h 
+endif
+endif

=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am     2009-04-06 20:29:42 +0000
+++ b/utilities/Makefile.am     2009-04-20 16:24:55 +0000
@@ -40,6 +40,7 @@
        $(MYSQL_LIBS) \
        $(CURL_LIBS) \
        $(BOOST_LIBS) \
+       $(PYTHON_LIBS) \
        $(PTHREAD_LIBS) \
        $(LIBINTL) \
        $(NULL)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]