Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setup: iOS uses SDL2 by default now (with the new poly-arch branch on kivy-ios toolchain.)

This commit is contained in:
Mathieu Virbel 2015-02-13 18:36:27 +01:00
parent 3da70736f9
commit 393f7e7de9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup.py
View File

@ -265,7 +265,7 @@ if platform == 'ios':
print('Kivy-IOS project located at {0}'.format(kivy_ios_root)) print('Kivy-IOS project located at {0}'.format(kivy_ios_root))
print('Activate SDL compilation.') print('Activate SDL compilation.')
c_options['use_ios'] = True c_options['use_ios'] = True
c_options['use_sdl'] = True c_options['use_sdl2'] = True
# detect gstreamer, only on desktop # detect gstreamer, only on desktop
# works if we forced the options or in autodetection # works if we forced the options or in autodetection
@ -293,10 +293,10 @@ if platform not in ('ios', 'android') and (c_options['use_gstreamer']
c_options['use_gstreamer'] = True c_options['use_gstreamer'] = True
# detect SDL2, only on desktop # detect SDL2, only on desktop and iOS
# works if we forced the options or in autodetection # works if we forced the options or in autodetection
sdl2_flags = {} sdl2_flags = {}
if platform not in ('ios', 'android') and c_options['use_sdl2'] in (None, True): if platform not in ('android') and c_options['use_sdl2'] in (None, True):
if c_options['use_osx_frameworks'] and platform == 'darwin': if c_options['use_osx_frameworks'] and platform == 'darwin':
# check the existence of frameworks # check the existence of frameworks
@ -324,7 +324,7 @@ if platform not in ('ios', 'android') and c_options['use_sdl2'] in (None, True):
c_options['use_sdl2'] = True c_options['use_sdl2'] = True
print('Activate SDL2 compilation') print('Activate SDL2 compilation')
else: elif platform != "ios":
# use pkg-config approach instead # use pkg-config approach instead
sdl2_flags = pkgconfig('sdl2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer') sdl2_flags = pkgconfig('sdl2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer')
if 'libraries' in sdl2_flags: if 'libraries' in sdl2_flags:
@ -512,7 +512,7 @@ def determine_sdl2():
# no pkgconfig info, or we want to use a specific sdl2 path, so perform # no pkgconfig info, or we want to use a specific sdl2 path, so perform
# manual configuration # manual configuration
flags['libraries'] = ['SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer'] flags['libraries'] = ['SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer']
flags['include_dirs'] = ([sdl2_path] if sdl2_path else flags['include_dirs'] = (sdl2_path.split(':') if sdl2_path else
['/usr/local/include/SDL2', '/usr/include/SDL2']) ['/usr/local/include/SDL2', '/usr/include/SDL2'])
flags['extra_link_args'] = [] flags['extra_link_args'] = []