OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Don't raise an exception when DXSDK is not found.

Browse Source 
Unfortunately scons does not check if a tool exists before it invokes
its generate function.
This commit is contained in:
José Fonseca
2009-06-29 12:56:47 +01:00
parent bb8f3090ba
commit 9a5ee12434
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scons/dxsdk.py
View File

@@ -40,10 +40,11 @@ def get_dxsdk_root(env):
except KeyError: except KeyError:
return None return None
def get_dxsdk_paths(env): def generate(env):
dxsdk_root = get_dxsdk_root(env) dxsdk_root = get_dxsdk_root(env)
if dxsdk_root is None: if dxsdk_root is None:
raise SCons.Errors.InternalError, "DirectX SDK not found" # DirectX SDK not found
return
if env['machine'] in ('generic', 'x86'): if env['machine'] in ('generic', 'x86'):
target_cpu = 'x86' target_cpu = 'x86'
@@ -57,9 +58,6 @@ def get_dxsdk_paths(env):
env.Prepend(CPPPATH = [os.path.join(dxsdk_root, 'Include')]) env.Prepend(CPPPATH = [os.path.join(dxsdk_root, 'Include')])
env.Prepend(LIBPATH = [os.path.join(dxsdk_root, 'Lib', target_cpu)]) env.Prepend(LIBPATH = [os.path.join(dxsdk_root, 'Lib', target_cpu)])
def generate(env):
get_dxsdk_paths(env)
def exists(env): def exists(env):
return get_dxsdk_root(env) is not None return get_dxsdk_root(env) is not None