Add DIRECTDRAW_CFLAGS and DIRECTSOUND_CFLAGS to Makefile.am; save and restore the...

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).

diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am
index 999f026ebbe2cb696b8998467e9778e6d04232e0..3fa5e85fd97d666b3a1400e83c65136f11fb6760 100644 (file)
--- a/sys/directdraw/Makefile.am
+++ b/sys/directdraw/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstdirectdrawsink.la
 \r
 libgstdirectdrawsink_la_SOURCES =  gstdirectdrawsink.c gstdirectdrawplugin.c\r
 libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \\r
-       $(GST_PLUGINS_BASE_CFLAGS)\r
+       $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTDRAW_CFLAGS)\r
 libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \\r
        $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \\r
        -lgstinterfaces-$(GST_MAJORMINOR)\r
-libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)\r
+libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTDRAW_LDFLAGS)\r

diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index b8b26469cdc958b7eef865931dc00f51338c3ef8..3b24de6268c4eb661f1cc79620269e76eb07b2e3 100644 (file)
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstdirectsoundsink.la
 \r
 libgstdirectsoundsink_la_SOURCES =  gstdirectsoundsink.c gstdirectsoundplugin.c\r
 libgstdirectsoundsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \\r
-       $(GST_PLUGINS_BASE_CFLAGS)\r
+       $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS)\r
 libgstdirectsoundsink_la_LIBADD = $(DIRECTSOUND_LIBS) \\r
        $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \\r
        -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)\r
-libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)\r
+libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)\r