From c3fb73335f4834c747cfbf1c3463b25a80d273e8 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 12 Jun 2014 13:37:51 +1000 Subject: [PATCH] gl/examples: add GST_PLUGINS_BASE_CFLAGS --- tests/examples/gl/generic/cube/Makefile.am | 2 +- tests/examples/gl/generic/cubeyuv/Makefile.am | 2 +- tests/examples/gl/generic/doublecube/Makefile.am | 2 +- tests/examples/gl/generic/recordgraphic/Makefile.am | 2 +- tests/examples/gl/sdl/Makefile.am | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/examples/gl/generic/cube/Makefile.am b/tests/examples/gl/generic/cube/Makefile.am index c0eb3a116a..b6bd60b4e9 100644 --- a/tests/examples/gl/generic/cube/Makefile.am +++ b/tests/examples/gl/generic/cube/Makefile.am @@ -4,6 +4,6 @@ noinst_PROGRAMS = cube cube_SOURCES = main.cpp cube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) + $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) cube_LDADD=$(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/cubeyuv/Makefile.am b/tests/examples/gl/generic/cubeyuv/Makefile.am index c6e7cfa4a2..289cbd3f32 100644 --- a/tests/examples/gl/generic/cubeyuv/Makefile.am +++ b/tests/examples/gl/generic/cubeyuv/Makefile.am @@ -4,6 +4,6 @@ noinst_PROGRAMS = cubeyuv cubeyuv_SOURCES = main.cpp cubeyuv_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) + $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) cubeyuv_LDADD=$(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/doublecube/Makefile.am b/tests/examples/gl/generic/doublecube/Makefile.am index 4663a1d503..3f220de7a0 100644 --- a/tests/examples/gl/generic/doublecube/Makefile.am +++ b/tests/examples/gl/generic/doublecube/Makefile.am @@ -4,6 +4,6 @@ noinst_PROGRAMS = doublecube doublecube_SOURCES = main.cpp doublecube_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) + $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) doublecube_LDADD=$(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/recordgraphic/Makefile.am b/tests/examples/gl/generic/recordgraphic/Makefile.am index 2515f9234d..6a25c281f4 100644 --- a/tests/examples/gl/generic/recordgraphic/Makefile.am +++ b/tests/examples/gl/generic/recordgraphic/Makefile.am @@ -4,6 +4,6 @@ noinst_PROGRAMS = recordgraphic recordgraphic_SOURCES = main.cpp recordgraphic_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) + $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) recordgraphic_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/sdl/Makefile.am b/tests/examples/gl/sdl/Makefile.am index a26958cc69..12b51a642d 100644 --- a/tests/examples/gl/sdl/Makefile.am +++ b/tests/examples/gl/sdl/Makefile.am @@ -7,12 +7,11 @@ noinst_PROGRAMS += sdlshare sdlshare_SOURCES = sdlshare.c -sdlshare_CFLAGS=$(GST_VIDEO_CFLAGS) $(GST_CFLAGS) \ +sdlshare_CFLAGS=$(GST_PLUGINS_BASE_CFLAGS)$(GST_CFLAGS) \ $(GL_CFLAGS) $(SDL_CFLAGS) \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs -sdlshare_LDADD=$(GST_VIDEO_LIBS) $(GST_LIBS) \ - $(GL_LIBS) $(SDL_LIBS) \ +sdlshare_LDADD= $(GST_LIBS) $(GL_LIBS) $(SDL_LIBS) \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \ -lgstvideo-$(GST_API_VERSION)