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, 39 insertions, 35 deletions

diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index f704f02c513..a7ee2d51d14 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -3,47 +3,51 @@ import sys
 Import ('env')
 
 source_files = ['GPG_Application.cpp',
-				'GPG_Canvas.cpp',
-				'GPG_ghost.cpp',
-				'GPG_KeyboardDevice.cpp',
-				'GPG_System.cpp']
+                'GPG_Canvas.cpp',
+                'GPG_ghost.cpp',
+                'GPG_KeyboardDevice.cpp',
+                'GPG_System.cpp']
 
 incs = ['.',
-		'#intern/string',
-		'#intern/ghost',
-		'#intern/guardedalloc',
-		'#intern/bmfont',
-		'#intern/moto/include',
-		'#intern/SoundSystem',
-		'#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
-		'#source/kernel/gen_system',
-		'#source/kernel/gen_messaging',
-		'#source/gameengine/Converter',
-		'#source/blender/imbuf',
-		'#source/gameengine/Ketsji',
-		'#source/blender/blenlib',
-		'#source/blender/blenkernel',
-		'#source/blender/readblenfile',
-		'#source/blender',
-		'#source/blender/editors/include',
-		'#source/blender/makesdna',
-		'#source/gameengine/Rasterizer',
-		'#source/gameengine/GameLogic',
-		'#source/gameengine/Expressions',
-		'#source/gameengine/Network',
-		'#source/gameengine/SceneGraph',
-		'#source/gameengine/Physics/common',
-		'#source/gameengine/Physics/Sumo',
-		'#source/gameengine/Physics/Sumo/Fuzzics/include',
-		'#source/gameengine/Network/LoopBackNetwork',
-		'#source/gameengine/GamePlayer/common',
-		'#source/blender/misc',
-		'#source/blender/blenloader']
+        '#intern/string',
+        '#intern/ghost',
+        '#intern/guardedalloc',
+        '#intern/bmfont',
+        '#intern/moto/include',
+        '#intern/SoundSystem',
+        '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
+        '#source/kernel/gen_system',
+        '#source/kernel/gen_messaging',
+        '#source/gameengine/Converter',
+        '#source/blender/imbuf',
+        '#source/gameengine/Ketsji',
+        '#source/blender/blenlib',
+        '#source/blender/blenkernel',
+        '#source/blender/readblenfile',
+        '#source/blender',
+        '#source/blender/include',
+        '#source/blender/makesdna',
+        '#source/gameengine/BlenderRoutines',
+        '#source/gameengine/Rasterizer',
+        '#source/gameengine/GameLogic',
+        '#source/gameengine/Expressions',
+        '#source/gameengine/Network',
+        '#source/gameengine/SceneGraph',
+        '#source/gameengine/Physics/common',
+        '#source/gameengine/Physics/Sumo',
+        '#source/gameengine/Physics/Sumo/Fuzzics/include',
+        '#source/gameengine/Network/LoopBackNetwork',
+        '#source/gameengine/GamePlayer/common',
+        '#source/blender/misc',
+        '#source/blender/blenloader',
+        '#source/blender/gpu',
+        '#extern/glew/include']
 
 incs += Split(env['BF_PYTHON_INC'])
 incs += Split(env['BF_SOLID_INC'])
 cflags = []
 if env['OURPLATFORM']=='win32-vc':
-	cflags = ['/GR']
+    cflags = ['/GR']
+
 
 env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=5, compileflags=cflags)