diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-08-14 07:27:42 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-08-14 07:27:42 +0200 |
| commit | 2793937d485235be7f0e60f0f6b783bedcc1816c (patch) | |
| tree | 36de5f1db6b671107ac8efb1cb89b5ce15a0e711 | |
| parent | 1d509c9b6a214128b0a347d8b159c495ac6a9f62 (diff) | |
And also check for mono-cairo and only compile the appsrc sample when it's available
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | samples/Makefile.am | 11 |
2 files changed, 15 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 1139fe2..4827a3b 100644 --- a/configure.ac +++ b/configure.ac @@ -121,13 +121,16 @@ PKG_CHECK_MODULES(GST, AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) -# glib-sharp and gtk-sharp are currently only needed for the samples -PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= 2.12, have_glibsharp=yes, have_glibsharp=no) -PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= 2.12, have_gtksharp=yes, have_gtksharp=no) -AC_SUBST(GLIBSHARP_LIBS) -AC_SUBST(GTKSHARP_LIBS) +# glib-sharp and gtk-sharp and mono-cairo are currently only needed for the samples +PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-2.0 >= 2.12, have_glibsharp=yes, have_glibsharp=no) +PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.12, have_gtksharp=yes, have_gtksharp=no) +PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo, have_monocairo=yes, have_monocairo=no) +AC_SUBST(GLIB_SHARP_LIBS) +AC_SUBST(GTK_SHARP_LIBS) +AC_SUBST(MONO_CAIRO_LIBS) AM_CONDITIONAL(HAVE_GLIB_SHARP, test "x$have_glibsharp" = "xyes") AM_CONDITIONAL(HAVE_GTK_SHARP, test "x$have_gtksharp" = "xyes") +AM_CONDITIONAL(HAVE_MONO_CAIRO, test "x$have_monocairo" = "xyes") AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") diff --git a/samples/Makefile.am b/samples/Makefile.am index b6fa410..8486aff 100644 --- a/samples/Makefile.am +++ b/samples/Makefile.am @@ -1,17 +1,20 @@ TARGETS = if HAVE_GLIB_SHARP -TARGETS += playbin-player.exe decodebin-transcoder.exe helloworld.exe typefind.exe metadata.exe appsrc.exe +TARGETS += playbin-player.exe decodebin-transcoder.exe helloworld.exe typefind.exe metadata.exe if HAVE_GTK_SHARP TARGETS += gtk-video-player.exe endif +if HAVE_MONO_CAIRO +TARGETS += appsrc.exe +endif endif DEBUGS = $(addsuffix .mdb, $(TARGETS)) all: $(TARGETS) link assemblies=$(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll -references=$(addprefix -r:, $(assemblies)) $(GLIBSHARP_LIBS) +references=$(addprefix -r:, $(assemblies)) $(GLIB_SHARP_LIBS) playbin-player.exe: $(srcdir)/PlayBinPlayer.cs $(assemblies) $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(srcdir)/PlayBinPlayer.cs @@ -35,10 +38,10 @@ mp3launchparse.exe: $(srcdir)/MP3LaunchParse.cs $(assemblies) $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(srcdir)/MP3LaunchParse.cs appsrc.exe: $(srcdir)/AppSrc.cs $(assemblies) - $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) -r:Mono.Cairo.dll $(srcdir)/AppSrc.cs + $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(MONO_CAIRO_LIBS) $(srcdir)/AppSrc.cs gtk-video-player.exe: $(srcdir)/GtkVideoPlayer.cs $(assemblies) - $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(GTKSHARP_LIBS) $(srcdir)/GtkVideoPlayer.cs + $(CSC) -out:$@ $(GLIBSHARP_LIBS) $(references) $(GTK_SHARP_LIBS) $(srcdir)/GtkVideoPlayer.cs link: ln -sf $(top_builddir)/gstreamer-sharp/gstreamer-sharp.dll gstreamer-sharp.dll |