Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2015-02-18 14:07:48 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2015-02-18 14:08:20 +0300
commit6920735cff6b5b2ab9e4e6d8090fb48bba7d9ba4 (patch)
treec877cd68b3636d8dbc65014675d6e0cdeed20644 /source/blender/python/SConscript
parent7f7413bce24ea21cd5e47f307d84d20606ac349c (diff)
Include SDL information in system info text.
Adds bpy.app.sdl to expose SDL version information. When SDL is not available on a Linux system, certain Blender features are silently disabled (like joystick support in the BGE). This change is the first step towards making it more obvious why something isn't working. SDL information is exposed to Python via bpy.app.sdl, in the same way as OCIO and OIIO information is exposed. Generated system-info.txt contains SDL loading method (linked or dynamically loaded by Blender) and SDL version number. Reviewed by: sergey, campbellbarton Differential Revision: https://developer.blender.org/D1112
Diffstat (limited to 'source/blender/python/SConscript')
-rw-r--r--source/blender/python/SConscript5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 9988e0981aa..5f032f25cf3 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -159,6 +159,11 @@ if env['WITH_BF_OPENAL']:
if env['WITH_BF_SDL']:
defs.append('WITH_SDL')
+ incs += ' ' + env['BF_SDL_INC']
+
+ if env['WITH_BF_SDL_DYNLOAD']:
+ defs.append('WITH_SDL_DYNLOAD')
+ incs += ' #extern/sdlew/include'
if env['WITH_BF_JACK']:
defs.append('WITH_JACK')