windows: Put the DirectX LDFLAGS in the correct place and reorder libraries

This commit is contained in:
Sebastian Dröge 2012-11-21 10:21:50 +01:00
parent c6343ae5b5
commit 97a365c439
3 changed files with 10 additions and 9 deletions

View file

@ -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

View file

@ -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

View file

@ -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