diff options
| -rw-r--r-- | scons/custom.py | 4 | ||||
| -rw-r--r-- | src/mesa/shader/slang/library/SConscript | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scons/custom.py b/scons/custom.py index 572b963388..364da292dd 100644 --- a/scons/custom.py +++ b/scons/custom.py @@ -56,6 +56,7 @@ def quietCommandLines(env): env['SHLINKCOMSTR'] = " Linking $TARGET ..." env['LDMODULECOMSTR'] = " Linking $TARGET ..." env['SWIGCOMSTR'] = " Generating $TARGET ..." + env['CODEGENCOMSTR'] = " Generating $TARGET ..." def createConvenienceLibBuilder(env): @@ -125,7 +126,8 @@ def code_generate(env, script, target, source, command): # This command creates generated code *in the build directory*. command = command.replace('$SCRIPT', script_src.path) - code = env.Command(target, source, command) + action = SCons.Action.Action(command, "$CODEGENCOMSTR") + code = env.Command(target, source, action) # Explicitly mark that the generated code depends on the generator, # and on implicitly imported python modules diff --git a/src/mesa/shader/slang/library/SConscript b/src/mesa/shader/slang/library/SConscript index ef131146be..0b25467a4e 100644 --- a/src/mesa/shader/slang/library/SConscript +++ b/src/mesa/shader/slang/library/SConscript @@ -12,13 +12,13 @@ def glsl_compile_emitter(target, source, env): return (target, source) bld_frag = Builder( - action = glsl_compile[0].abspath + ' fragment $SOURCE $TARGET', + action = Action(glsl_compile[0].abspath + ' fragment $SOURCE $TARGET', '$CODEGENCODESTR'), emitter = glsl_compile_emitter, suffix = '.gc', src_suffix = '_gc.h') bld_vert = Builder( - action = glsl_compile[0].abspath + ' vertex $SOURCE $TARGET', + action = Action(glsl_compile[0].abspath + ' vertex $SOURCE $TARGET', '$CODEGENCODESTR'), emitter = glsl_compile_emitter, suffix = '.gc', src_suffix = '_gc.h') |