summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiago.sousa.santos@collabora.com>2013-03-21 02:18:07 -0300
committerThiago Santos <thiago.sousa.santos@collabora.com>2013-04-16 16:08:51 -0300
commitd44c7f9baf6af8a1546198caf46bd18a25b4bf9e (patch)
tree25d9521804184642d1386a96f92b72da595c9751
parentdd1426b525cfa44a931a98cb22e8a828fba267c3 (diff)
downloadgstreamer-plugins-bad-d44c7f9baf6af8a1546198caf46bd18a25b4bf9e.tar.gz
eglglessink: makefile fixes for eagl
Use the OBJC flags for OBJC. Add missing frameworks Also add all files to EXTRA_DIST.
-rw-r--r--ext/eglgles/Makefile.am12
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/eglgles/Makefile.am b/ext/eglgles/Makefile.am
index ced394de4..b60acb02a 100644
--- a/ext/eglgles/Makefile.am
+++ b/ext/eglgles/Makefile.am
@@ -12,8 +12,11 @@ libgsteglglessink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \
$(EGLGLES_CFLAGS)
-libgsteglglessink_la_CPPFLAGS = $(libgsteglglessink_la_CFLAGS)
-libgsteglglessink_la_OBJCFLAGS = $(libgsteglglessink_la_CFLAGS)
+libgsteglglessink_la_OBJCFLAGS = $(GST_PLUGINS_BASE_OBJCFLAGS) \
+ $(GST_BASE_OBJCFLAGS) \
+ $(GST_OBJCFLAGS) \
+ $(EGLGLES_OBJCFLAGS) \
+ -fobjc-abi-version=2 -fobjc-legacy-dispatch
libgsteglglessink_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) $(EGLGLES_LIBS) \
@@ -21,7 +24,8 @@ libgsteglglessink_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
-lgstinterfaces-$(GST_MAJORMINOR)
if HAVE_IOS
-libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,-framework,OpenGLES -Wl,-framework,QuartzCore -Wl,-framework,UIKit -Wl,-framework,Foundation
+libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,-framework,OpenGLES -Wl,-framework,QuartzCore -Wl,-framework,IOKit -Wl,-framework,UIKit -Wl,-framework,CoreGraphics -Wl,-framework,CoreFoundation -Wl,-framework,Foundation -W
+
else
libgsteglglessink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
endif
@@ -30,3 +34,5 @@ libgsteglglessink_la_LIBTOOLFLAGS = --tag=disable-static
endif
noinst_HEADERS = gsteglglessink.h video_platform_wrapper.h gstegladaptation.h
+
+EXTRA_DIST = gsteglglessink.c gstegladaptation.c gstegladaptation_egl.c video_platform_wrapper.c gstegladaptation_eagl.m $(noinst_HEADERS)