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:
authorCampbell Barton <ideasman42@gmail.com>2010-07-12 22:26:35 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-07-12 22:26:35 +0400
commitd80d6e28127dcfb83b11d88c993595f846ffbb02 (patch)
treec147380634b0214cbaf47a1f778403563fc930ca /SConstruct
parent3b81c67353b9b0b9539fe7befbba0d7e449e912b (diff)
re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct5
1 files changed, 4 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 26fa5b47198..09ada7d7f70 100644
--- a/SConstruct
+++ b/SConstruct
@@ -46,6 +46,9 @@ import glob
import re
from tempfile import mkdtemp
+# needed for importing tools
+sys.path.append(os.path.join(".", "build_files", "scons"))
+
import tools.Blender
import tools.btools
import tools.bcolors
@@ -159,7 +162,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