summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-06-29 12:56:47 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-06-29 12:56:47 +0100
commit9a5ee124347d3f75be2e957142143338dd96abe3 (patch)
tree9d343cd1dbfd2b22376591889bf5b8969b5d4d18 /scons
parentbb8f3090ba37aa3f24943fdb43c4120776289658 (diff)
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.
Diffstat (limited to 'scons')
-rw-r--r--scons/dxsdk.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/scons/dxsdk.py b/scons/dxsdk.py
index a369e1da10..de090e4f99 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