diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-28 00:30:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 00:30:55 +0200 |
| commit | 5f28ab6566a4e12b802f06584ead65e640c295f1 (patch) | |
| tree | 02d3d8969f9bf5d27fbeeaf2d02b43555b26666a /main | |
| parent | 3edcccafd99aa76cc4fdd0585209e99189a3db55 (diff) | |
| parent | d86de6c98e435d31bfdebc50d2db6d4d4048be40 (diff) | |
Merge pull request #40771 from Xrayez/scons-verbose-builders
SCons: Refactor running commands through builders
Diffstat (limited to 'main')
| -rw-r--r-- | main/SCsub | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/main/SCsub b/main/SCsub index 97f77840f1..ebadefd450 100644 --- a/main/SCsub +++ b/main/SCsub @@ -2,7 +2,6 @@ Import("env") -from platform_methods import run_in_subprocess import main_builders env.main_sources = [] @@ -15,15 +14,21 @@ if env["tests"]: env_main.Append(CPPDEFINES=["TESTS_ENABLED"]) env_main.Depends("#main/splash.gen.h", "#main/splash.png") -env_main.CommandNoCache("#main/splash.gen.h", "#main/splash.png", run_in_subprocess(main_builders.make_splash)) +env_main.CommandNoCache( + "#main/splash.gen.h", "#main/splash.png", env.Run(main_builders.make_splash, "Building splash screen header."), +) env_main.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png") env_main.CommandNoCache( - "#main/splash_editor.gen.h", "#main/splash_editor.png", run_in_subprocess(main_builders.make_splash_editor) + "#main/splash_editor.gen.h", + "#main/splash_editor.png", + env.Run(main_builders.make_splash_editor, "Building editor splash screen header."), ) env_main.Depends("#main/app_icon.gen.h", "#main/app_icon.png") -env_main.CommandNoCache("#main/app_icon.gen.h", "#main/app_icon.png", run_in_subprocess(main_builders.make_app_icon)) +env_main.CommandNoCache( + "#main/app_icon.gen.h", "#main/app_icon.png", env.Run(main_builders.make_app_icon, "Building application icon."), +) lib = env_main.add_library("main", env.main_sources) env.Prepend(LIBS=[lib]) |