diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-05-15 17:22:58 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-05-15 17:22:58 +0000 |
| commit | b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8 (patch) | |
| tree | 09dc4a5ccb6a4f8ec33b07de2212e73900a9142e /sys | |
| parent | b629fd955a7cc30c6a58dc734dda7e424cda72b2 (diff) | |
| download | gst-plugins-bad-b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8.tar.gz gst-plugins-bad-b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8.tar.bz2 gst-plugins-bad-b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8.zip | |
Add DIRECTDRAW_CFLAGS and DIRECTSOUND_CFLAGS to Makefile.am; save and restore the various flags in the directdraw/dir...
Original commit message from CVS:
* configure.ac:
* sys/directdraw/Makefile.am:
* sys/directsound/Makefile.am:
Add DIRECTDRAW_CFLAGS and DIRECTSOUND_CFLAGS to Makefile.am; save
and restore the various flags in the directdraw/directsound
detection section. Apparently improves cross-compiling for win32
with mingw32 under some circumstances (#437539).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/directdraw/Makefile.am | 4 | ||||
| -rw-r--r-- | sys/directsound/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am index 999f026e..3fa5e85f 100644 --- a/sys/directdraw/Makefile.am +++ b/sys/directdraw/Makefile.am @@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstdirectdrawsink.la libgstdirectdrawsink_la_SOURCES = gstdirectdrawsink.c gstdirectdrawplugin.c
libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS)
+ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTDRAW_CFLAGS)
libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-lgstinterfaces-$(GST_MAJORMINOR)
-libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTDRAW_LDFLAGS)
diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am index b8b26469..3b24de62 100644 --- a/sys/directsound/Makefile.am +++ b/sys/directsound/Makefile.am @@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstdirectsoundsink.la libgstdirectsoundsink_la_SOURCES = gstdirectsoundsink.c gstdirectsoundplugin.c
libgstdirectsoundsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS)
+ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS)
libgstdirectsoundsink_la_LIBADD = $(DIRECTSOUND_LIBS) \
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
-libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
|