Module: Mesa Branch: gallium-0.1 Commit: 0b110313a95dda91c6a83d88546ea8c9e615829a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b110313a95dda91c6a83d88546ea8c9e615829a
Author: José Fonseca <[email protected]> Date: Mon Jun 29 12:56:47 2009 +0100 scons: Don't raise an exception when DXSDK is not found. Unfortunately scons does not check if a tool exists before it invokes its generate function. (cherry picked from commit 9a5ee124347d3f75be2e957142143338dd96abe3) --- scons/dxsdk.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scons/dxsdk.py b/scons/dxsdk.py index a369e1d..de090e4 100644 --- a/scons/dxsdk.py +++ b/scons/dxsdk.py @@ -40,10 +40,11 @@ def get_dxsdk_root(env): except KeyError: return None -def get_dxsdk_paths(env): +def generate(env): dxsdk_root = get_dxsdk_root(env) if dxsdk_root is None: - raise SCons.Errors.InternalError, "DirectX SDK not found" + # DirectX SDK not found + return if env['machine'] in ('generic', 'x86'): target_cpu = 'x86' @@ -57,9 +58,6 @@ def get_dxsdk_paths(env): env.Prepend(CPPPATH = [os.path.join(dxsdk_root, 'Include')]) env.Prepend(LIBPATH = [os.path.join(dxsdk_root, 'Lib', target_cpu)]) -def generate(env): - get_dxsdk_paths(env) - def exists(env): return get_dxsdk_root(env) is not None _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
