mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-28 23:02:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: host_system is 'ios' when building for iOS

Browse source 
The cross file sets this value, and we use 'ios' in Cerbero.
This commit is contained in:
Nirbheek Chauhan 2018-08-17 02:59:14 +05:30
parent 62e4e15245
commit b5aa5fa308
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/gl/meson.build
View file

@ -290,7 +290,7 @@ endif
gl_dep = unneeded_dep gl_dep = unneeded_dep
glx_dep = unneeded_dep glx_dep = unneeded_dep
if need_api_opengl != 'no' or need_platform_glx != 'no' if need_api_opengl != 'no' or need_platform_glx != 'no'
if host_machine.system() == 'darwin' if ['darwin', 'ios'].contains(host_system)
gl_dep = dependency('OpenGL', required : false) gl_dep = dependency('OpenGL', required : false)
else else
# override meson's braindead gl detection on osx/windows/etc by forcing pkg-config # override meson's braindead gl detection on osx/windows/etc by forcing pkg-config
@ -326,7 +326,7 @@ if need_api_opengl != 'no' or need_platform_glx != 'no'
endif endif
opengl_includes = '' opengl_includes = ''
if host_machine.system() == 'darwin' if ['darwin', 'ios'].contains(host_system)
opengl_includes += ''' opengl_includes += '''
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
@ -356,7 +356,7 @@ if need_api_gles2 != 'no'
gles2_dep = dependency('glesv2', required : false) gles2_dep = dependency('glesv2', required : false)
if not gles2_dep.found() if not gles2_dep.found()
# if host_machine.system() == 'windows' # if host_machine.system() == 'windows'
# elif host_machine.system() == 'darwin' # elif ['darwin', 'ios'].contains(host_system)
# gles2_dep = cc.find_library('GLESv2', required : false) # gles2_dep = cc.find_library('GLESv2', required : false)
# else # else
gles2_dep = cc.find_library('GLESv2', required : false) gles2_dep = cc.find_library('GLESv2', required : false)
@ -640,7 +640,7 @@ elif need_platform_cgl == 'no' and need_win_cocoa == 'yes'
error('Impossible situation requested: Cannot use Cocoa without CGL support') error('Impossible situation requested: Cannot use Cocoa without CGL support')
endif endif
if host_machine.system() == 'darwin' if ['darwin', 'ios'].contains(host_system)
if not have_objc if not have_objc
error('No ObjC compiler found') error('No ObjC compiler found')
endif endif