gl/examples: add the srcdir and builddir includes
And remove references to $(GST_PLUGINS_GL_*)
This commit is contained in:
parent
d7f8cc9a78
commit
0c6bf7b752
@ -7,7 +7,8 @@ noinst_PROGRAMS += cluttershare
|
|||||||
|
|
||||||
cluttershare_SOURCES = cluttershare.c
|
cluttershare_SOURCES = cluttershare.c
|
||||||
|
|
||||||
cluttershare_CFLAGS=$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
cluttershare_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
$(GST_CFLAGS) $(GL_CFLAGS) $(CLUTTER_CFLAGS)
|
$(GST_CFLAGS) $(GL_CFLAGS) $(CLUTTER_CFLAGS)
|
||||||
cluttershare_LDADD=$(CLUTTER_LIBS) $(GST_PLUGINS_BASE_LIBS) \
|
cluttershare_LDADD=$(CLUTTER_LIBS) $(GST_PLUGINS_BASE_LIBS) \
|
||||||
$(GST_LIBS) $(GL_LIBS) \
|
$(GST_LIBS) $(GL_LIBS) \
|
||||||
@ -24,7 +25,8 @@ noinst_PROGRAMS += clutteractor clutteractortee
|
|||||||
|
|
||||||
clutteractor_SOURCES = clutteractor.c
|
clutteractor_SOURCES = clutteractor.c
|
||||||
|
|
||||||
clutteractor_CFLAGS=$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
clutteractor_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GL_CFLAGS) $(CLUTTER_CFLAGS) \
|
$(GL_CFLAGS) $(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS)
|
$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS)
|
||||||
clutteractor_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \
|
clutteractor_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \
|
||||||
@ -33,7 +35,8 @@ clutteractor_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \
|
|||||||
|
|
||||||
clutteractortee_SOURCES = clutteractortee.c
|
clutteractortee_SOURCES = clutteractortee.c
|
||||||
|
|
||||||
clutteractortee_CFLAGS=$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
clutteractortee_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GL_CFLAGS) $(CLUTTER_CFLAGS) \
|
$(GL_CFLAGS) $(CLUTTER_CFLAGS) \
|
||||||
$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS)
|
$(CLUTTER_GLX_CFLAGS) $(CLUTTER_X11_CFLAGS) $(XCOMPOSITE_CFLAGS)
|
||||||
clutteractortee_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \
|
clutteractortee_LDADD=$(CLUTTER_LIBS) $(CLUTTER_GLX_LIBS) $(CLUTTER_X11_LIBS) \
|
||||||
|
@ -4,9 +4,10 @@ noinst_PROGRAMS = cocoa-videooverlay
|
|||||||
|
|
||||||
cocoa_videooverlay_SOURCES = cocoa-videooverlay.m
|
cocoa_videooverlay_SOURCES = cocoa-videooverlay.m
|
||||||
|
|
||||||
cocoa_videooverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
cocoa_videooverlay_OBJCFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GL_CFLAGS) ${GL_OBJCFLAGS}
|
$(GL_CFLAGS) ${GL_OBJCFLAGS}
|
||||||
cocoa_videooverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
cocoa_videooverlay_LDADD=$(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
||||||
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
||||||
|
|
||||||
cocoa_videooverlay_LIBTOOLFLAGS = --tag=OBJC
|
cocoa_videooverlay_LIBTOOLFLAGS = --tag=OBJC
|
||||||
|
@ -3,6 +3,7 @@ noinst_PROGRAMS = cube
|
|||||||
|
|
||||||
cube_SOURCES = main.cpp
|
cube_SOURCES = main.cpp
|
||||||
|
|
||||||
cube_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS)
|
cube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
cube_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_LIBS) $(GL_LIBS)
|
$(GST_CXXFLAGS) $(GL_CFLAGS)
|
||||||
|
cube_LDADD=$(GST_LIBS) $(GL_LIBS)
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ noinst_PROGRAMS = cubeyuv
|
|||||||
|
|
||||||
cubeyuv_SOURCES = main.cpp
|
cubeyuv_SOURCES = main.cpp
|
||||||
|
|
||||||
cubeyuv_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS)
|
cubeyuv_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
cubeyuv_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_LIBS) $(GL_LIBS)
|
$(GST_CXXFLAGS) $(GL_CFLAGS)
|
||||||
|
cubeyuv_LDADD=$(GST_LIBS) $(GL_LIBS)
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ noinst_PROGRAMS = doublecube
|
|||||||
|
|
||||||
doublecube_SOURCES = main.cpp
|
doublecube_SOURCES = main.cpp
|
||||||
|
|
||||||
doublecube_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS)
|
doublecube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
doublecube_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_LIBS) $(GL_LIBS)
|
$(GST_CXXFLAGS) $(GL_CFLAGS)
|
||||||
|
doublecube_LDADD=$(GST_LIBS) $(GL_LIBS)
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ noinst_PROGRAMS = recordgraphic
|
|||||||
|
|
||||||
recordgraphic_SOURCES = main.cpp
|
recordgraphic_SOURCES = main.cpp
|
||||||
|
|
||||||
recordgraphic_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS)
|
recordgraphic_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
recordgraphic_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) $(GL_LIBS)
|
$(GST_CXXFLAGS) $(GL_CFLAGS)
|
||||||
|
recordgraphic_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) $(GL_LIBS)
|
||||||
|
|
||||||
|
@ -4,7 +4,8 @@ SUBDIRS = . gtkvideooverlay filternovideooverlay filtervideooverlay fxtest switc
|
|||||||
noinst_LTLIBRARIES = libgstgtkhelper.la
|
noinst_LTLIBRARIES = libgstgtkhelper.la
|
||||||
|
|
||||||
libgstgtkhelper_la_SOURCES = gstgtk.c gstgtk.h
|
libgstgtkhelper_la_SOURCES = gstgtk.c gstgtk.h
|
||||||
libgstgtkhelper_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK3_CFLAGS)
|
libgstgtkhelper_la_CFLAGS = -I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK3_CFLAGS)
|
||||||
|
|
||||||
if HAVE_WINDOW_COCOA
|
if HAVE_WINDOW_COCOA
|
||||||
libgstgtkhelper_la_CFLAGS += -x objective-c
|
libgstgtkhelper_la_CFLAGS += -x objective-c
|
||||||
|
@ -2,9 +2,10 @@ noinst_PROGRAMS = filtervideooverlay
|
|||||||
|
|
||||||
filtervideooverlay_SOURCES = main.cpp
|
filtervideooverlay_SOURCES = main.cpp
|
||||||
|
|
||||||
filtervideooverlay_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \
|
filtervideooverlay_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \
|
||||||
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
||||||
filtervideooverlay_LDADD=../libgstgtkhelper.la \
|
filtervideooverlay_LDADD=../libgstgtkhelper.la \
|
||||||
$(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
$(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
||||||
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
||||||
|
|
||||||
|
@ -3,16 +3,18 @@ noinst_PROGRAMS += pixbufdrop
|
|||||||
|
|
||||||
fxtest_SOURCES = fxtest.c
|
fxtest_SOURCES = fxtest.c
|
||||||
|
|
||||||
fxtest_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
fxtest_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
||||||
fxtest_LDADD=../libgstgtkhelper.la \
|
fxtest_LDADD=../libgstgtkhelper.la \
|
||||||
$(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
$(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
||||||
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
||||||
|
|
||||||
pixbufdrop_SOURCES = pixbufdrop.c
|
pixbufdrop_SOURCES = pixbufdrop.c
|
||||||
|
|
||||||
pixbufdrop_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
pixbufdrop_CFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
||||||
pixbufdrop_LDADD=../libgstgtkhelper.la \
|
pixbufdrop_LDADD=../libgstgtkhelper.la \
|
||||||
$(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
$(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
||||||
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
||||||
|
@ -2,9 +2,10 @@ noinst_PROGRAMS = gtkvideooverlay
|
|||||||
|
|
||||||
gtkvideooverlay_SOURCES = main.cpp
|
gtkvideooverlay_SOURCES = main.cpp
|
||||||
|
|
||||||
gtkvideooverlay_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \
|
gtkvideooverlay_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \
|
||||||
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
||||||
gtkvideooverlay_LDADD=../libgstgtkhelper.la \
|
gtkvideooverlay_LDADD=../libgstgtkhelper.la \
|
||||||
$(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
$(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
||||||
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
||||||
|
|
||||||
|
@ -2,9 +2,10 @@ noinst_PROGRAMS = switchvideooverlay
|
|||||||
|
|
||||||
switchvideooverlay_SOURCES = main.cpp
|
switchvideooverlay_SOURCES = main.cpp
|
||||||
|
|
||||||
switchvideooverlay_CXXFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \
|
switchvideooverlay_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \
|
||||||
|
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) \
|
||||||
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
$(GL_CFLAGS) $(GTK3_CFLAGS)
|
||||||
switchvideooverlay_LDADD=../libgstgtkhelper.la \
|
switchvideooverlay_LDADD=../libgstgtkhelper.la \
|
||||||
$(GTK3_LIBS) $(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
$(GTK3_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \
|
||||||
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
$(GL_LIBS) -lgstvideo-$(GST_API_VERSION)
|
||||||
|
|
||||||
|
@ -7,11 +7,11 @@ noinst_PROGRAMS += sdlshare
|
|||||||
|
|
||||||
sdlshare_SOURCES = sdlshare.c
|
sdlshare_SOURCES = sdlshare.c
|
||||||
|
|
||||||
sdlshare_CFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_CFLAGS) \
|
sdlshare_CFLAGS=$(GST_VIDEO_CFLAGS) $(GST_CFLAGS) \
|
||||||
$(GL_CFLAGS) $(SDL_CFLAGS) \
|
$(GL_CFLAGS) $(SDL_CFLAGS) \
|
||||||
-I$(top_srcdir)/gst-libs \
|
-I$(top_srcdir)/gst-libs \
|
||||||
-I$(top_builddir)/gst-libs
|
-I$(top_builddir)/gst-libs
|
||||||
sdlshare_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_VIDEO_LIBS) $(GST_LIBS) \
|
sdlshare_LDADD=$(GST_VIDEO_LIBS) $(GST_LIBS) \
|
||||||
$(GL_LIBS) $(SDL_LIBS) \
|
$(GL_LIBS) $(SDL_LIBS) \
|
||||||
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
|
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
|
||||||
-lgstvideo-$(GST_API_VERSION)
|
-lgstvideo-$(GST_API_VERSION)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user