Commit b753d1c6 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Rename "ios2 vout" into "ios vout"

It does not make sense anymore
parent 4ceff8a0
......@@ -436,7 +436,7 @@ $Id$
* vod_rtsp: RTSP VoD module
* volume_neon: audio volume optimized for ARM NEON
* vorbis: a vorbis audio decoder/packetizer using the libvorbis library
* vout_ios2: iOS video provider using OpenGL ES 2
* vout_ios: iOS video provider using OpenGL ES 2
* vout_macosx: Mac OS X OpenGL provider
* vout_sdl: video output module using the SDL library
* vpx: WebM encoder and decoder (VP8/VP9)
......
......@@ -43,16 +43,16 @@ libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la
endif
libvout_ios2_plugin_la_SOURCES = video_output/ios2.m $(OPENGL_COMMONSOURCES)
libvout_ios2_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS)
libvout_ios2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
libvout_ios_plugin_la_SOURCES = video_output/ios.m $(OPENGL_COMMONSOURCES)
libvout_ios_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCFLAGS)
libvout_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit \
$(OPENGL_COMMONLDFLAGS)
if HAVE_IOS
vout_LTLIBRARIES += libvout_ios2_plugin.la
vout_LTLIBRARIES += libvout_ios_plugin.la
endif
if HAVE_TVOS
vout_LTLIBRARIES += libvout_ios2_plugin.la
vout_LTLIBRARIES += libvout_ios_plugin.la
endif
### OpenGL ###
......
/*****************************************************************************
* ios2.m: iOS OpenGL ES 2 provider
* ios.m: iOS OpenGL ES provider
*****************************************************************************
* Copyright (C) 2001-2016 VLC authors and VideoLAN
* Copyright (C) 2001-2017 VLC authors and VideoLAN
* $Id$
*
* Authors: Pierre d'Herbemont <pdherbemont at videolan dot org>
......@@ -81,7 +81,7 @@ vlc_module_begin ()
set_capability("vout display", 300)
set_callbacks(Open, Close)
add_shortcut("vout_ios2")
add_shortcut("vout_ios2", "vout_ios")
vlc_module_end ()
@interface VLCOpenGLES2VideoView : UIView {
......
......@@ -1126,7 +1126,7 @@ modules/video_output/drawable.c
modules/video_output/evas.c
modules/video_output/fb.c
modules/video_output/glx.c
modules/video_output/ios2.m
modules/video_output/ios.m
modules/video_output/kva.c
modules/video_output/macosx.m
modules/video_output/opengl/display.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment