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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user