From 593fe7cd79a1cfdbee96c98a12d0dc8e9794f1a8 Mon Sep 17 00:00:00 2001 From: akshayaurora Date: Thu, 17 Dec 2015 23:38:24 +0530 Subject: [PATCH] fix compilation using frameworks on osx --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index fa60fecc1..9498c2e95 100644 --- a/setup.py +++ b/setup.py @@ -601,6 +601,9 @@ def determine_sdl2(): sdl2_path = environ.get('KIVY_SDL2_PATH', None) + if sdl2_flags and not sdl2_path: + return sdl2_flags + # no pkgconfig info, or we want to use a specific sdl2 path, so perform # manual configuration flags['libraries'] = ['SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer'] @@ -614,8 +617,7 @@ def determine_sdl2(): sdl2_paths = [sdl_inc] sdl2_paths.extend(['/usr/local/include/SDL2', '/usr/include/SDL2']) - flags['include_dirs'] = ( - sdl2_paths if sdl2_paths else sdl2_paths) + flags['include_dirs'] = sdl2_paths flags['extra_link_args'] = [] flags['extra_compile_args'] = []