Revision: 30237 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30237 Author: campbellbarton Date: 2010-07-12 20:26:35 +0200 (Mon, 12 Jul 2010)
Log Message: ----------- re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config Modified Paths: -------------- trunk/blender/CMakeLists.txt trunk/blender/SConstruct Added Paths: ----------- trunk/blender/build_files/ trunk/blender/build_files/cmake/ trunk/blender/build_files/make/ trunk/blender/build_files/scons/ trunk/blender/build_files/scons/config/ trunk/blender/build_files/scons/tools/ Removed Paths: ------------- trunk/blender/CMake/ trunk/blender/config/ trunk/blender/make/ trunk/blender/tools/ Modified: trunk/blender/CMakeLists.txt =================================================================== --- trunk/blender/CMakeLists.txt 2010-07-12 18:15:48 UTC (rev 30236) +++ trunk/blender/CMakeLists.txt 2010-07-12 18:26:35 UTC (rev 30237) @@ -61,7 +61,7 @@ #----------------------------------------------------------------------------- # Load some macros. -INCLUDE(CMake/macros.cmake) +INCLUDE(build_files/cmake/macros.cmake) #----------------------------------------------------------------------------- # Set default config options Modified: trunk/blender/SConstruct =================================================================== --- trunk/blender/SConstruct 2010-07-12 18:15:48 UTC (rev 30236) +++ trunk/blender/SConstruct 2010-07-12 18:26:35 UTC (rev 30237) @@ -46,6 +46,9 @@ 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 @@ 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 Copied: trunk/blender/build_files/cmake (from rev 30212, trunk/blender/CMake) Copied: trunk/blender/build_files/make (from rev 30212, trunk/blender/make) Copied: trunk/blender/build_files/scons/config (from rev 30212, trunk/blender/config) Copied: trunk/blender/build_files/scons/tools (from rev 30212, trunk/blender/tools) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs