From 2e8e9a17099f0413e48206fb5e6992b2702f5bb0 Mon Sep 17 00:00:00 2001 From: Mirko Date: Sun, 12 Jan 2020 12:20:06 +0100 Subject: [PATCH] Add IOS_IS_WINDOWED env switch + update SDL2 (#414) * Add IOS_IS_WINDOWED env switch + update SDL2 * updated kivy hash --- recipes/kivy/__init__.py | 4 ++-- recipes/sdl2/__init__.py | 8 ++++---- .../templates/{{ cookiecutter.project_name }}-ios/main.m | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/recipes/kivy/__init__.py b/recipes/kivy/__init__.py index a3e7b9c..3f95553 100644 --- a/recipes/kivy/__init__.py +++ b/recipes/kivy/__init__.py @@ -9,8 +9,8 @@ logger = logging.getLogger(__name__) class KivyRecipe(CythonRecipe): - # post kivy 1.11.1, including Fbo depthbuffer fixes for iOS - version = "18f37ed6e29620ee53c2a7699e0e0894e06a7f91" + # post kivy 1.11.1, including statusbar/fullscreen fix + version = "38fcbd5b90c99a96d82682f14986836cde81412d" url = "https://github.com/kivy/kivy/archive/{version}.zip" library = "libkivy.a" depends = ["sdl2", "sdl2_image", "sdl2_mixer", "sdl2_ttf", "ios", diff --git a/recipes/sdl2/__init__.py b/recipes/sdl2/__init__.py index 2fa7555..ccc9481 100644 --- a/recipes/sdl2/__init__.py +++ b/recipes/sdl2/__init__.py @@ -3,10 +3,10 @@ import sh class LibSDL2Recipe(Recipe): - version = "2.0.9" - url = "https://www.libsdl.org/release/SDL2-{version}.tar.gz" - #version = "iOS-improvements" - #url = "https://bitbucket.org/slime73/sdl-experiments/get/{version}.tar.gz" + # version = "2.0.9" + # url = "https://www.libsdl.org/release/SDL2-{version}.tar.gz" + version = "7cc4fc886d9e" + url = "https://hg.libsdl.org/SDL/archive/{version}.tar.gz" library = "Xcode-iOS/SDL/build/Release-{arch.sdk}/libSDL2.a" include_dir = "include" pbx_frameworks = [ diff --git a/tools/templates/{{ cookiecutter.project_name }}-ios/main.m b/tools/templates/{{ cookiecutter.project_name }}-ios/main.m index b45b685..6a09ed4 100644 --- a/tools/templates/{{ cookiecutter.project_name }}-ios/main.m +++ b/tools/templates/{{ cookiecutter.project_name }}-ios/main.m @@ -42,6 +42,10 @@ int main(int argc, char *argv[]) { putenv("KIVY_IMAGE=imageio,tex,gif"); putenv("KIVY_AUDIO=sdl2"); putenv("KIVY_GL_BACKEND=sdl2"); + + // IOS_IS_WINDOWED=True disables fullscreen and then statusbar is shown + putenv("IOS_IS_WINDOWED=False"); + #ifndef DEBUG putenv("KIVY_NO_CONSOLELOG=1"); #endif