Merge branch 'linux' into merge_linux

2018-02-08 20:36:46 +01:00
parent cb9f0eda53 75c3fd55ea
commit d940f2c39d
128 changed files with 1618 additions and 29 deletions
--- a/test/SConscript
+++ b/test/SConscript
@@ -10,7 +10,7 @@ test_sources = Glob("""*.cpp""") + Split("""
 if str(platform) == "win32" and 'msvc' in env["TOOLS"]:
 	test = env.Program("#build/bin/boe_test", party_classes + common_sources + test_sources, LINKFLAGS='/nologo /SUBSYSTEM:CONSOLE /MACHINE:X86')
 else:
-	test = env.Program("#build/bin/boe_test", party_classes + common_sources + test_sources)
+	test = env.Program("#build/bin/boe_test", test_sources + party_classes + common_sources)

 def run_tests(env,target,source):
   import subprocess