From cd64ea0f68d3741f0640d67501c2dbff2ae650b3 Mon Sep 17 00:00:00 2001 From: loonycyborg Date: Tue, 9 Sep 2008 10:27:16 +0000 Subject: [PATCH] No longer duplicate source files to builddir. --- SConstruct | 2 +- src/editor/SConscript | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 16f2272..61d4a14 100644 --- a/SConstruct +++ b/SConstruct @@ -111,7 +111,7 @@ Export("env") Export("editor_env") if env["HOST"]: build = env["Build"] + "-" + env["HOST"] else: build = env["Build"] -silvertree, editor = SConscript("src/SConscript", build_dir = join("build", build)) +silvertree, editor = SConscript("src/SConscript", build_dir = join("build", build), duplicate = False) if (not env["HOST"] or env["HOST"] == "mingw32") and env["Build"] == "release": ExecutableSuffix = env["PROGSUFFIX"] diff --git a/src/editor/SConscript b/src/editor/SConscript index 1024967..afbc535 100644 --- a/src/editor/SConscript +++ b/src/editor/SConscript @@ -3,6 +3,7 @@ Import("editor_env") Import("lib_silvertree") if editor_env["HaveQt"]: + editor_env.Append(CPPPATH = ".") editor_sources = Glob("*.cpp", source = True, strings = True) editor_sources.remove("oldmain.cpp") editor_uis = Glob("*.ui", source = True)