diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gst-libs/gst/dshow/Makefile.am | 6 | ||||
| -rw-r--r-- | sys/dshowdecwrapper/Makefile.am | 4 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2008-04-25 Michael Smith <msmith@songbirdnest.com> + + * gst-libs/gst/dshow/Makefile.am: + Use CXXFLAGS rather than CFLAGS; these are C++ files. + Define required constants appropriately. + * sys/dshowdecwrapper/Makefile.am: + Add required include dir, libraries. + Define required constants appropriately. + 2008-04-25 Wim Taymans <wim.taymans@collabora.co.uk> * gst/rtpmanager/gstrtpbin.c: (create_stream), (gst_rtp_bin_init), diff --git a/gst-libs/gst/dshow/Makefile.am b/gst-libs/gst/dshow/Makefile.am index 582df9ad..d9ab5404 100644 --- a/gst-libs/gst/dshow/Makefile.am +++ b/gst-libs/gst/dshow/Makefile.am @@ -1,10 +1,10 @@ lib_LTLIBRARIES = libgstdshow-@GST_MAJORMINOR@.la libgstdshow_@GST_MAJORMINOR@_la_SOURCES = gstdshow.cpp gstdshowfakesink.cpp gstdshowfakesrc.cpp gstdshowinterface.cpp -libgstdshow_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) +libgstdshow_@GST_MAJORMINOR@_la_CXXFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) -DLIBDSHOW_EXPORTS libgstdshow_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) libgstdshow_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_ALL_LDFLAGS) -libgstdshow_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/app +libgstdshow_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dshow libgstdshow_@GST_MAJORMINOR@include_HEADERS = gstdshow.h gstdshowfakesink.h gstdshowfakesrc.h gstdshowinterface.h diff --git a/sys/dshowdecwrapper/Makefile.am b/sys/dshowdecwrapper/Makefile.am index 3b03a40d..7e9782bf 100644 --- a/sys/dshowdecwrapper/Makefile.am +++ b/sys/dshowdecwrapper/Makefile.am @@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstdshowdecwrapper.la libgstdshowdecwrapper_la_SOURCES = gstdshowaudiodec.c gstdshowdecwrapper.c gstdshowvideodec.c -libgstdshowdecwrapper_la_CFLAGS = $(GST_CFLAGS) -libgstdshowdecwrapper_la_LIBADD = $(GST_LIBS) +libgstdshowdecwrapper_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst-libs/gst -DLIBGSTDSHOWDECWRAPPER_EXPORTS +libgstdshowdecwrapper_la_LIBADD = $(GST_LIBS) $(top_builddir)/gst-libs/gst/dshow/libgstdshow-@GST_MAJORMINOR@.la libgstdshowdecwrapper_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstdshowaudiodec.h gstdshowdecwrapper.h gstdshowvideodec.h |