From b979d59b3dc6c2a249b6c53ccd2cf95f3daf1ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 15 May 2007 17:22:58 +0000 Subject: 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). --- sys/directdraw/Makefile.am | 4 ++-- sys/directsound/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys') 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) -- cgit v1.2.1