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, 10 insertions, 9 deletions

diff --git a/source/nan_link.mk b/source/nan_link.mk
index 668955e5fb6..8dda3b8c2df 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -87,7 +87,7 @@ ifeq ($(OS),linux)
     LLIBS += -lc -lm -ldl -lutil
     LOPTS = -export-dynamic
   endif
-  ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64"))
+  ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64 parisc64 powerpc sparc64"))
     COMMENT = "MESA 3.1"
     LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread 
@@ -97,13 +97,6 @@ ifeq ($(OS),linux)
     SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
     DYNLDFLAGS = -shared $(LDFLAGS)
   endif
-  ifeq ($(CPU),$(findstring $(CPU), "powerpc sparc64"))
-    LLIBS = -L/usr/X11R6/lib/ -lXmu -lXext -lX11 -lc -ldl -lm -lutil
-    DADD = -lGL -lGLU
-    SADD = /usr/lib/libGL.a /usr/lib/libGLU.a
-    LOPTS = -export-dynamic
-	DYNLDFLAGS = -shared $(LDFLAGS)
-  endif
     LLIBS += -lz
 endif
 
@@ -116,8 +109,12 @@ endif
 ifeq ($(OS),solaris)
     ifeq (x86_64, $(findstring x86_64, $(CPU)))
         LLIBS = -lrt
+        LLIBS += -L$(NAN_MESA)/lib/amd64
+    else
+        LLIBS += -L$(NAN_MESA)/lib
     endif
-    LLIBS += -L$(NAN_MESA)/lib -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl 
+    
+    LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl 
     DYNLDFLAGS = -shared $(LDFLAGS)
 endif
 
@@ -166,4 +163,8 @@ ifeq ($(INTERNATIONAL),true)
    LLIBS += $(NAN_GETTEXT_LIB)
 endif
 
+ifeq ($(WITH_BF_OPENMP),true)
+   LLIBS += -lgomp
+endif
+
 LLIBS += $(NAN_PYTHON_LIB)