[vlc-commits] build system: fix object names for vout_ios2 and ios dialog provider

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Mar  6 21:56:12 2014 +0100| [09e5b394ff228fa8d3f79432ef283b3defc2cdbf] | committer: Felix Paul Kühne

build system: fix object names for vout_ios2 and ios dialog provider

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=09e5b394ff228fa8d3f79432ef283b3defc2cdbf
---

 modules/gui/ios_dialog_provider/Modules.am |    1 +
 modules/video_output/Modules.am            |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gui/ios_dialog_provider/Modules.am b/modules/gui/ios_dialog_provider/Modules.am
index 2166d07..48796dd 100644
--- a/modules/gui/ios_dialog_provider/Modules.am
+++ b/modules/gui/ios_dialog_provider/Modules.am
@@ -1,6 +1,7 @@
 AM_LIBTOOLFLAGS=--tag=CC
 
 libios_dialog_provider_plugin_la_SOURCES = dialogProvider.m
+libios_dialog_provider_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
 libios_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit
 
 if HAVE_IOS
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 35d055d..adf5f0b 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -36,11 +36,12 @@ libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-fram
 vout_LTLIBRARIES += libvout_macosx_plugin.la libvout_coregraphicslayer_plugin.la libcaopengllayer_plugin.la
 endif
 
-if HAVE_IOS
 libvout_ios2_plugin_la_SOURCES = ios2.m opengl.h opengl.c
 libvout_ios2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libvout_ios2_plugin_la_LIBADD = $(GL_LIBS)
+libvout_ios2_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(GL_OBJCFLAGS)
+libvout_ios2_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS)
 libvout_ios2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit
+if HAVE_IOS
 vout_LTLIBRARIES += libvout_ios2_plugin.la
 endif