Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct18
1 files changed, 10 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct
index 26fa5b47198..b11df1b4c67 100644
--- a/SConstruct
+++ b/SConstruct
@@ -46,17 +46,19 @@ import glob
import re
from tempfile import mkdtemp
-import tools.Blender
-import tools.btools
-import tools.bcolors
+# needed for importing tools
+sys.path.append(os.path.join(".", "build_files", "scons", "tools"))
+
+import Blender
+import btools
+import bcolors
EnsureSConsVersion(1,0,0)
-BlenderEnvironment = tools.Blender.BlenderEnvironment
-btools = tools.btools
-B = tools.Blender
+BlenderEnvironment = Blender.BlenderEnvironment
+B = Blender
-VERSION = tools.btools.VERSION # This is used in creating the local config directories
+VERSION = btools.VERSION # This is used in creating the local config directories
### globals ###
platform = sys.platform
@@ -159,7 +161,7 @@ if crossbuild and platform not in ('win32-vc', 'win64-vc'):
env['OURPLATFORM'] = platform
-configfile = 'config'+os.sep+platform+'-config.py'
+configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
if os.path.exists(configfile):
print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile