Skip to content

Commit b81d873

Browse files
committed
Merge pull request kivy#2672 from kivy/sdl2_path
Rename KIVY_SDL_PATH TO KIVY_SDL2_PATH and clean up env var query
2 parents 5a28b01 + 8913bed commit b81d873

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

doc/sources/guide/environment.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ KIVY_HOME
4444

4545
.. versionadded:: 1.9.0
4646

47-
KIVY_SDL_PATH
47+
KIVY_SDL2_PATH
4848
If set, the SDL2 libraries and headers from this path are used when
4949
compiling kivy instead of the ones installed system-wide.
5050
To use the same libraries while running a kivy app, this path must be

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,7 @@ def determine_sdl2():
394394
if not c_options['use_sdl2']:
395395
return flags
396396

397-
if 'KIVY_SDL_PATH' in environ:
398-
sdl2_path = environ['KIVY_SDL_PATH']
399-
else:
400-
sdl2_path = None
397+
sdl2_path = environ.get('KIVY_SDL2_PATH', None)
401398

402399
flags['libraries'] = ['SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer']
403400
flags['include_dirs'] = ([sdl2_path] if sdl2_path else

0 commit comments

Comments
 (0)