Move `tests` to the top-level directory
This commit is contained in:
parent
6f292f906e
commit
9f649efe5d
|
@ -661,8 +661,7 @@ if selected_platform in platform_list:
|
||||||
|
|
||||||
Export("env")
|
Export("env")
|
||||||
|
|
||||||
# build subdirs, the build order is dependent on link order.
|
# Build subdirs, the build order is dependent on link order.
|
||||||
|
|
||||||
SConscript("core/SCsub")
|
SConscript("core/SCsub")
|
||||||
SConscript("servers/SCsub")
|
SConscript("servers/SCsub")
|
||||||
SConscript("scene/SCsub")
|
SConscript("scene/SCsub")
|
||||||
|
@ -671,9 +670,11 @@ if selected_platform in platform_list:
|
||||||
|
|
||||||
SConscript("platform/SCsub")
|
SConscript("platform/SCsub")
|
||||||
SConscript("modules/SCsub")
|
SConscript("modules/SCsub")
|
||||||
|
if env["tests"]:
|
||||||
|
SConscript("tests/SCsub")
|
||||||
SConscript("main/SCsub")
|
SConscript("main/SCsub")
|
||||||
|
|
||||||
SConscript("platform/" + selected_platform + "/SCsub") # build selected platform
|
SConscript("platform/" + selected_platform + "/SCsub") # Build selected platform.
|
||||||
|
|
||||||
# Microsoft Visual Studio Project Generation
|
# Microsoft Visual Studio Project Generation
|
||||||
if env["vsproj"]:
|
if env["vsproj"]:
|
||||||
|
|
|
@ -20,8 +20,5 @@ env.CommandNoCache(
|
||||||
env.Depends("#main/app_icon.gen.h", "#main/app_icon.png")
|
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))
|
env.CommandNoCache("#main/app_icon.gen.h", "#main/app_icon.png", run_in_subprocess(main_builders.make_app_icon))
|
||||||
|
|
||||||
if env["tests"]:
|
|
||||||
SConscript("tests/SCsub")
|
|
||||||
|
|
||||||
lib = env.add_library("main", env.main_sources)
|
lib = env.add_library("main", env.main_sources)
|
||||||
env.Prepend(LIBS=[lib])
|
env.Prepend(LIBS=[lib])
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
#include "servers/xr_server.h"
|
#include "servers/xr_server.h"
|
||||||
|
|
||||||
#ifdef TESTS_ENABLED
|
#ifdef TESTS_ENABLED
|
||||||
#include "main/tests/test_main.h"
|
#include "tests/test_main.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TOOLS_ENABLED
|
#ifdef TOOLS_ENABLED
|
||||||
|
|
Loading…
Reference in New Issue