diff options
author | Julien Isorce <julien.isorce@gmail.com> | 2014-05-02 05:46:18 +0100 |
---|---|---|
committer | Julien Isorce <julien.isorce@gmail.com> | 2014-05-02 06:03:22 +0100 |
commit | 6f5ecebb6a42527baa7add7dd0d5714ea5f7719a (patch) | |
tree | d1258a847e1de9df57e73c7f88c2b30f45caa7a9 | |
parent | 1fb949bb3a3852e7b2c4501aa015e017c9210bb0 (diff) | |
download | gstreamer-plugins-bad-6f5ecebb6a42527baa7add7dd0d5714ea5f7719a.tar.gz |
gl: rename cocoa example and move it to its parent directory
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | tests/examples/gl/cocoa/.gitignore | 1 | ||||
-rwxr-xr-x | tests/examples/gl/cocoa/Makefile.am | 14 | ||||
-rwxr-xr-x | tests/examples/gl/cocoa/cocoa-videooverlay.m (renamed from tests/examples/gl/cocoa/videooverlay/main.m) | 0 | ||||
-rw-r--r-- | tests/examples/gl/cocoa/videooverlay/.gitignore | 1 | ||||
-rwxr-xr-x | tests/examples/gl/cocoa/videooverlay/Makefile.am | 14 |
6 files changed, 13 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index e73032f46..99a97d62e 100644 --- a/configure.ac +++ b/configure.ac @@ -3240,7 +3240,6 @@ tests/examples/camerabin2/Makefile tests/examples/directfb/Makefile tests/examples/gl/Makefile tests/examples/gl/cocoa/Makefile -tests/examples/gl/cocoa/videooverlay/Makefile tests/examples/gl/clutter/Makefile tests/examples/gl/generic/Makefile tests/examples/gl/generic/cube/Makefile diff --git a/tests/examples/gl/cocoa/.gitignore b/tests/examples/gl/cocoa/.gitignore new file mode 100644 index 000000000..5cfb85ef2 --- /dev/null +++ b/tests/examples/gl/cocoa/.gitignore @@ -0,0 +1 @@ +cocoa-videooverlay diff --git a/tests/examples/gl/cocoa/Makefile.am b/tests/examples/gl/cocoa/Makefile.am index 716aa30e5..c13ec526e 100755 --- a/tests/examples/gl/cocoa/Makefile.am +++ b/tests/examples/gl/cocoa/Makefile.am @@ -1,4 +1,14 @@ - if HAVE_WINDOW_COCOA -SUBDIRS = videooverlay + +noinst_PROGRAMS = cocoa-videooverlay + +cocoa_videooverlay_SOURCES = cocoa-videooverlay.m + +cocoa_videooverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ + $(GL_CFLAGS) ${GL_OBJCFLAGS} +cocoa_videooverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ + $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) + +cocoa_videooverlay_LIBTOOLFLAGS = --tag=OBJC + endif diff --git a/tests/examples/gl/cocoa/videooverlay/main.m b/tests/examples/gl/cocoa/cocoa-videooverlay.m index 8f959fe0b..8f959fe0b 100755 --- a/tests/examples/gl/cocoa/videooverlay/main.m +++ b/tests/examples/gl/cocoa/cocoa-videooverlay.m diff --git a/tests/examples/gl/cocoa/videooverlay/.gitignore b/tests/examples/gl/cocoa/videooverlay/.gitignore deleted file mode 100644 index c5ee310fb..000000000 --- a/tests/examples/gl/cocoa/videooverlay/.gitignore +++ /dev/null @@ -1 +0,0 @@ -videooverlay diff --git a/tests/examples/gl/cocoa/videooverlay/Makefile.am b/tests/examples/gl/cocoa/videooverlay/Makefile.am deleted file mode 100755 index 47dac610c..000000000 --- a/tests/examples/gl/cocoa/videooverlay/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -if HAVE_WINDOW_COCOA - -noinst_PROGRAMS = videooverlay - -videooverlay_SOURCES = main.m - -videooverlay_OBJCFLAGS=$(GST_PLUGINS_GL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ - $(GL_CFLAGS) -I/usr/local/include/gstreamer-${GST_API_VERSION} ${GL_OBJCFLAGS} -videooverlay_LDADD=$(GST_PLUGINS_GL_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) \ - $(GL_LIBS) -lgstvideo-$(GST_API_VERSION) - -videooverlay_LIBTOOLFLAGS = --tag=OBJC - -endif |