vlc | branch: master | David Fuhrmann <[email protected]> | Wed Jun 24 20:23:50 2015 +0200| [9b221d44d051ca9d7b8dbfaaf6e9697751e95acc] | committer: David Fuhrmann
ios_dialog_provider: Remove Modules.am > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b221d44d051ca9d7b8dbfaaf6e9697751e95acc --- configure.ac | 1 - modules/gui/Makefile.am | 13 +++++++++---- modules/gui/ios_dialog_provider/.gitignore | 1 - modules/gui/ios_dialog_provider/Modules.am | 9 --------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index ba8aa2a..e7fc001 100644 --- a/configure.ac +++ b/configure.ac @@ -4150,7 +4150,6 @@ AC_CONFIG_FILES([ lib/Makefile bin/Makefile test/Makefile - modules/gui/ios_dialog_provider/Makefile modules/gui/macosx/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile diff --git a/modules/gui/Makefile.am b/modules/gui/Makefile.am index 46dad91..47bd638 100644 --- a/modules/gui/Makefile.am +++ b/modules/gui/Makefile.am @@ -1,14 +1,11 @@ guidir = $(pluginsdir)/gui gui_LTLIBRARIES = -DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2 gui/ios_dialog_provider +DIST_SUBDIRS += gui/macosx gui/qt4 gui/skins2 if ENABLE_MACOSX_UI SUBDIRS += gui/macosx endif -if HAVE_IOS -SUBDIRS += gui/ios_dialog_provider -endif if ENABLE_QT4 SUBDIRS += gui/qt4 endif @@ -46,3 +43,11 @@ libminimal_macosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -Wl,-framework,Cocoa EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la gui_LTLIBRARIES += $(LTLIBminimal_macosx) + + +libios_dialog_provider_plugin_la_SOURCES = gui/ios_dialog_provider/dialogProvider.m +libios_dialog_provider_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) +libios_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit +if HAVE_IOS +gui_LTLIBRARIES += libios_dialog_provider_plugin.la +endif diff --git a/modules/gui/ios_dialog_provider/.gitignore b/modules/gui/ios_dialog_provider/.gitignore deleted file mode 100644 index 08a6d72..0000000 --- a/modules/gui/ios_dialog_provider/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.am diff --git a/modules/gui/ios_dialog_provider/Modules.am b/modules/gui/ios_dialog_provider/Modules.am deleted file mode 100644 index 48796dd..0000000 --- a/modules/gui/ios_dialog_provider/Modules.am +++ /dev/null @@ -1,9 +0,0 @@ -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 -gui_LTLIBRARIES += libios_dialog_provider_plugin.la -endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
