Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 21 insertions, 5 deletions

diff --git a/tools/Blender.py b/tools/Blender.py
index 894922032fa..b192a591aa1 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -99,7 +99,10 @@ def create_blender_liblist(lenv = None, libtype = None):
 		sortlist.sort()
 		for sk in sortlist:
 			v = curlib[sk]
-			lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+			target = root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']
+			if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+				target = '#'+target
+			lst.append(target)
 
 	return lst
 
@@ -324,7 +327,6 @@ def AppIt(target=None, source=None, env=None):
 	if b=='verse':
 		print bc.OKBLUE+"no bundle for verse"+bc.ENDC 
 		return 0
-   
 	
 	sourcedir = bldroot + '/source/darwin/%s.app'%binary
 	sourceinfo = bldroot + "/source/darwin/%s.app/Contents/Info.plist"%binary
@@ -396,6 +398,7 @@ class BlenderEnvironment(SConsEnvironment):
 		print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
 		lenv = self.Clone()
 		res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
+		
 		SConsEnvironment.Default(self, res)
 		resources.append(res)
 
@@ -403,8 +406,15 @@ class BlenderEnvironment(SConsEnvironment):
 		if not self or not libname or not sources:
 			print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
 			self.Exit()
-		if libname in quickie or len(quickie)==0:
-			if libname in quickdebug: 
+
+		def list_substring(quickie, libname):
+			for q in quickie:
+				if libname.find(q) != -1:
+					return True
+			return False
+
+		if list_substring(quickie, libname) or len(quickie)==0:
+			if list_substring(quickdebug, libname):
 				print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC
 			else:
 				print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC
@@ -436,7 +446,11 @@ class BlenderEnvironment(SConsEnvironment):
 			lenv.Append(CFLAGS = lenv['C_WARN'])
 			lenv.Append(CCFLAGS = lenv['CC_WARN'])
 			lenv.Append(CXXFLAGS = lenv['CXX_WARN'])
-			lib = lenv.Library(target= '#'+root_build_dir+'lib/'+libname, source=sources)
+			
+			targetdir = root_build_dir+'lib/' + libname
+			if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+				targetdir = '#'+targetdir
+			lib = lenv.Library(target= targetdir, source=sources)
 			SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build
 		else:
 			print bc.WARNING+'Not building '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC+' for '+bc.OKBLUE+'BF_QUICK'+bc.ENDC
@@ -468,6 +482,8 @@ class BlenderEnvironment(SConsEnvironment):
 		if lenv['BF_PROFILE']:
 				lenv.Append(LINKFLAGS = lenv['BF_PROFILE_FLAGS'])
 		lenv.Append(CPPPATH=includes)
+		if root_build_dir[0]==os.sep or root_build_dir[1]==':':
+			lenv.Append(LIBPATH=root_build_dir + '/lib')
 		lenv.Append(LIBPATH=libpath)
 		lenv.Append(LIBS=libs)
 		if lenv['WITH_BF_QUICKTIME']: