diff options
| author | Jan Schmidt <jan@centricular.com> | 2015-05-20 02:38:53 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2015-05-21 13:42:35 +1000 |
| commit | cdff13e07b60bc793e66057522995011c8cb6004 (patch) | |
| tree | 7191273837fe546ad1b41d28300e8344301dce04 /tests/examples/gl | |
| parent | e7381ed17a4ce50e83ae52ffb0796fe1a26ae06a (diff) | |
Fix flags order in GL examples for uninstalled build
Diffstat (limited to 'tests/examples/gl')
| -rw-r--r-- | tests/examples/gl/generic/cube/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/examples/gl/generic/cubeyuv/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/examples/gl/generic/doublecube/Makefile.am | 4 |
3 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 7262533e5..e1b0cef6f 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_PLUGINS_BASE_CFLAGS) -cube_LDADD=$(GST_LIBS) -lgstvideo-$(GST_API_VERSION) $(GL_LIBS) + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) +cube_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/cubeyuv/Makefile.am b/tests/examples/gl/generic/cubeyuv/Makefile.am index 98697f002..b23287127 100644 --- a/tests/examples/gl/generic/cubeyuv/Makefile.am +++ b/tests/examples/gl/generic/cubeyuv/Makefile.am @@ -4,6 +4,5 @@ noinst_PROGRAMS = cubeyuv cubeyuv_SOURCES = main.cpp cubeyuv_CXXFLAGS=-I$(top_srcdir)/gst-libs -I$(top_builddir)/gst-libs \ - $(GST_CXXFLAGS) $(GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -cubeyuv_LDADD=$(GST_LIBS) $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) - + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) +cubeyuv_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(GL_LIBS) diff --git a/tests/examples/gl/generic/doublecube/Makefile.am b/tests/examples/gl/generic/doublecube/Makefile.am index a13182906..7f1489561 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_PLUGINS_BASE_CFLAGS) -doublecube_LDADD=$(GST_LIBS) $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(GL_CFLAGS) +doublecube_LDADD=$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS) $(GL_LIBS) |