diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-27 08:15:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 08:15:00 +0200 |
| commit | d1ecc15c118e3c089cdce51ca2736c76ee0ff3a3 (patch) | |
| tree | 741ef91a1c60b2638e1b2fb4a3d5837637f0c6fc | |
| parent | 17a81a32d83bbff2a46b6a1b05cfcd58687adaed (diff) | |
| parent | 752debe204eed001f52109b2b83a2f606a42101d (diff) | |
Merge pull request #32365 from Xrayez/scons-no-tests-release
SCons: do not build tests with tools=no
| -rw-r--r-- | main/SCsub | 3 | ||||
| -rw-r--r-- | main/main.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/SCsub b/main/SCsub index 62bc155c67..73cec1d250 100644 --- a/main/SCsub +++ b/main/SCsub @@ -28,7 +28,8 @@ env.CommandNoCache("#main/splash_editor.gen.h", "#main/splash_editor.png", run_i env.Depends("#main/app_icon.gen.h", "#main/app_icon.png") env.CommandNoCache("#main/app_icon.gen.h", "#main/app_icon.png", run_in_subprocess(main_builders.make_app_icon)) -SConscript('tests/SCsub') +if env["tools"]: + SConscript('tests/SCsub') lib = env.add_library("main", env.main_sources) env.Prepend(LIBS=[lib]) diff --git a/main/main.cpp b/main/main.cpp index 5de5c52b14..bff7633188 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1457,12 +1457,11 @@ bool Main::start() { }; if (test != "") { -#ifdef DEBUG_ENABLED +#ifdef TOOLS_ENABLED main_loop = test_main(test, args); if (!main_loop) return false; - #endif } else if (script != "") { |