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).
diff --git a/ChangeLog b/ChangeLog
index 23d316f..9f03761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-05-15 Tim-Philipp Müller <tim at centricular dot net>
+
+ * 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).
+
2007-05-15 Wim Taymans <wim@fluendo.com>
* gst/rtpmanager/gstrtpptdemux.c: (gst_rtp_pt_demux_chain):
diff --git a/configure.ac b/configure.ac
index e93569f..86eca92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,11 @@
translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTDRAW, true)
AG_GST_CHECK_FEATURE(DIRECTDRAW, [DirectDraw plug-in], directdrawsink, [
HAVE_DIRECTDRAW="no"
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $DIRECTDRAW_CFLAGS"
+ LDFLAGS="$LDFLAGS $DIRECTDRAW_LDFLAGS"
LIBS="$LIBS -lddraw -lgdi32"
AC_MSG_CHECKING(for DirectDraw LDFLAGS)
AC_LINK_IFELSE([
@@ -353,12 +357,15 @@
[HAVE_DIRECTDRAW="yes"],
[HAVE_DIRECTDRAW="no"])
AC_MSG_RESULT($HAVE_DIRECTDRAW)
+ CFLAGS=$save_CFLAGS
+ LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
if test "x$HAVE_DIRECTDRAW" = "xyes"; then
dnl this is much more than we want
- DIRECTDRAW_LIBS="-lddraw -lgdi32"
+ DIRECTDRAW_LIBS="-lddraw -ldxguid -lgdi32"
AC_SUBST(DIRECTDRAW_CFLAGS)
+ AC_SUBST(DIRECTDRAW_LDFLAGS)
AC_SUBST(DIRECTDRAW_LIBS)
fi
AC_SUBST(HAVE_DIRECTDRAW)
@@ -368,7 +375,11 @@
translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTSOUND, true)
AG_GST_CHECK_FEATURE(DIRECTSOUND, [DirectSound plug-in], directsoundsink, [
HAVE_DIRECTSOUND="no"
+ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $DIRECTSOUND_CFLAGS"
+ LDFLAGS="$LDFLAGS $DIRECTSOUND_LDFLAGS"
LIBS="$LIBS -ldsound -ldxerr9"
AC_MSG_CHECKING(for DirectSound LDFLAGS)
AC_LINK_IFELSE([
@@ -387,12 +398,15 @@
[HAVE_DIRECTSOUND="yes"],
[HAVE_DIRECTSOUND="no"])
AC_MSG_RESULT($HAVE_DIRECTSOUND)
+ CFLAGS=$save_CFLAGS
+ LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
if test "x$HAVE_DIRECTSOUND" = "xyes"; then
dnl this is much more than we want
DIRECTSOUND_LIBS="-ldsound -ldxerr9"
AC_SUBST(DIRECTSOUND_CFLAGS)
+ AC_SUBST(DIRECTSOUND_LDFLAGS)
AC_SUBST(DIRECTSOUND_LIBS)
fi
AC_SUBST(HAVE_DIRECTSOUND)
diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am
index 999f026..3fa5e85 100644
--- a/sys/directdraw/Makefile.am
+++ b/sys/directdraw/Makefile.am
@@ -2,8 +2,8 @@
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 b8b2646..3b24de6 100644
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -2,8 +2,8 @@
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)
