Merge branch 'master' of git://github.com/kivy/kivy-ios

This commit is contained in:
Richard Larkin 2016-11-08 08:38:59 +02:00
commit d5ea3af078
2 changed files with 4 additions and 4 deletions

View file

@ -32,10 +32,10 @@ Currently, the toolchain requires a few tools for compilation. You will need:
brew install autoconf automake libtool pkg-config brew install autoconf automake libtool pkg-config
brew link libtool brew link libtool
#. Install Cython (0.21):: #. Install Cython (0.23)::
# pip method if available (sudo might be needed.) # pip method if available (sudo might be needed.)
pip install cython==0.21 pip install cython==0.23
Using the toolchain Using the toolchain

View file

@ -121,8 +121,8 @@ void load_custom_builtin_importer() {
"import sys, imp\n" \ "import sys, imp\n" \
"from os import environ\n" \ "from os import environ\n" \
"from os.path import exists, join\n" \ "from os.path import exists, join\n" \
"# Fake redirection when we run the app without xcode\n" \ "# Fake redirection to supress console output\n" \
"if 'CFLOG_FORCE_STDERR' not in environ:\n" \ "if environ.get('KIVY_NO_CONSOLE', '0') == '1':\n" \
" class fakestd(object):\n" \ " class fakestd(object):\n" \
" def write(self, *args, **kw): pass\n" \ " def write(self, *args, **kw): pass\n" \
" def flush(self, *args, **kw): pass\n" \ " def flush(self, *args, **kw): pass\n" \