mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 00:36:51 +00:00
windows: Put the DirectX LDFLAGS in the correct place and reorder libraries
This commit is contained in:
parent
c6343ae5b5
commit
97a365c439
3 changed files with 10 additions and 9 deletions
|
@ -3,10 +3,11 @@ plugin_LTLIBRARIES = libgstdirectdrawsink.la
|
||||||
libgstdirectdrawsink_la_SOURCES = gstdirectdrawsink.c gstdirectdrawplugin.c
|
libgstdirectdrawsink_la_SOURCES = gstdirectdrawsink.c gstdirectdrawplugin.c
|
||||||
libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_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) \
|
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
|
||||||
-lgstinterfaces-$(GST_API_VERSION)
|
-lgstinterfaces-$(GST_API_VERSION) \
|
||||||
libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS)
|
$(DIRECTX_LDFLAGS) $(DIRECTDRAW_LIBS)
|
||||||
|
libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
||||||
noinst_HEADERS= gstdirectdrawsink.h
|
noinst_HEADERS= gstdirectdrawsink.h
|
||||||
|
|
|
@ -3,10 +3,10 @@ plugin_LTLIBRARIES = libgstdirectsoundsrc.la
|
||||||
libgstdirectsoundsrc_la_SOURCES = gstdirectsoundsrc.c gstdirectsoundplugin.c
|
libgstdirectsoundsrc_la_SOURCES = gstdirectsoundsrc.c gstdirectsoundplugin.c
|
||||||
libgstdirectsoundsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
libgstdirectsoundsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_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) \
|
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
|
||||||
-ldsound
|
$(DIRECTX_LDFLAGS) -ldsound
|
||||||
libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS)
|
libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
||||||
noinst_HEADERS= gstdirectsoundsrc.h
|
noinst_HEADERS= gstdirectsoundsrc.h
|
||||||
|
|
|
@ -7,10 +7,10 @@ libgstwinks_la_SOURCES = gstksclock.c \
|
||||||
ksvideohelpers.c
|
ksvideohelpers.c
|
||||||
libgstwinks_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
libgstwinks_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_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) \
|
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
|
||||||
-lgstinterfaces-$(GST_MAJORMINOR)
|
-lgstinterfaces-$(GST_MAJORMINOR) $(DIRECTX_LDFLAGS) $(DIRECTSHOW_LIBS)
|
||||||
libgstwinks_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS)
|
libgstwinks_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
libgstwinks_la_LIBTOOLFLAGS = --tag=disable-static
|
libgstwinks_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
||||||
noinst_HEADERS= gstksclock.h
|
noinst_HEADERS= gstksclock.h
|
||||||
|
|
Loading…
Reference in a new issue