From 97a365c439b467bba8297ce61120f6bd554bf4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 21 Nov 2012 10:21:50 +0100 Subject: [PATCH] windows: Put the DirectX LDFLAGS in the correct place and reorder libraries --- sys/directdraw/Makefile.am | 7 ++++--- sys/directsound/Makefile.am | 6 +++--- sys/winks/Makefile.am | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am index 16fc150068..d4e726207e 100644 --- a/sys/directdraw/Makefile.am +++ b/sys/directdraw/Makefile.am @@ -3,10 +3,11 @@ plugin_LTLIBRARIES = libgstdirectdrawsink.la libgstdirectdrawsink_la_SOURCES = gstdirectdrawsink.c gstdirectdrawplugin.c libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS) -libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \ +libgstdirectdrawsink_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ - -lgstinterfaces-$(GST_API_VERSION) -libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS) + -lgstinterfaces-$(GST_API_VERSION) \ + $(DIRECTX_LDFLAGS) $(DIRECTDRAW_LIBS) +libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS= gstdirectdrawsink.h diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am index c6b0e54b8c..6d18c4eb3d 100644 --- a/sys/directsound/Makefile.am +++ b/sys/directsound/Makefile.am @@ -3,10 +3,10 @@ plugin_LTLIBRARIES = libgstdirectsoundsrc.la libgstdirectsoundsrc_la_SOURCES = gstdirectsoundsrc.c gstdirectsoundplugin.c libgstdirectsoundsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS) -libgstdirectsoundsrc_la_LIBADD = $(DIRECTDRAW_LIBS) \ +libgstdirectsoundsrc_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ - -ldsound -libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS) + $(DIRECTX_LDFLAGS) -ldsound +libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS= gstdirectsoundsrc.h diff --git a/sys/winks/Makefile.am b/sys/winks/Makefile.am index 13dbe81b3c..234cbe7dc1 100644 --- a/sys/winks/Makefile.am +++ b/sys/winks/Makefile.am @@ -7,10 +7,10 @@ libgstwinks_la_SOURCES = gstksclock.c \ ksvideohelpers.c libgstwinks_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS) -libgstwinks_la_LIBADD = $(DIRECTSHOW_LIBS) \ +libgstwinks_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) -libgstwinks_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS) + -lgstinterfaces-$(GST_MAJORMINOR) $(DIRECTX_LDFLAGS) $(DIRECTSHOW_LIBS) +libgstwinks_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwinks_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS= gstksclock.h