synched with trunk at revision 32129

10 files changed, 32 insertions, 33 deletions

diff --git a/extern/SConscript b/extern/SConscript
index 6335c2fd7f0..0d4d562336f 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -18,7 +18,7 @@ if env['OURPLATFORM'] == 'linux2':
     SConscript(['binreloc/SConscript']);
 
 if env['WITH_BF_LZO']:
-	SConscript(['lzo/SConscript'])
+    SConscript(['lzo/SConscript'])
 
 if env['WITH_BF_LZMA']:
-	SConscript(['lzma/SConscript'])
+    SConscript(['lzma/SConscript'])
diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt
index 7bdc93fc978..cc27b82ede1 100644
--- a/extern/binreloc/CMakeLists.txt
+++ b/extern/binreloc/CMakeLists.txt
@@ -18,9 +18,15 @@
 # All rights reserved.
 #
 
-SET(INC ./include )
+SET(SRC
+	binreloc.c
+)
+
+SET(INC
+	./include
+)
+
 ADD_DEFINITIONS(-DENABLE_BINRELOC)
-FILE(GLOB SRC *.c)
+
 
 BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
-#, libtype=['core','player'], priority = [25,15] ) 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
index 2b067367767..7b45fad12df 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
@@ -24,12 +24,13 @@ btConvexHullShape ::btConvexHullShape (const btScalar* points,int numPoints,int
 	m_shapeType = CONVEX_HULL_SHAPE_PROXYTYPE;
 	m_unscaledPoints.resize(numPoints);
 
-	unsigned char* pointsBaseAddress = (unsigned char*)points;
+	unsigned char* pointsAddress = (unsigned char*)points;
 
 	for (int i=0;i<numPoints;i++)
 	{
-		btVector3* point = (btVector3*)(pointsBaseAddress + i*stride);
-		m_unscaledPoints[i] = point[0];
+		btScalar* point = (btScalar*)pointsAddress;
+		m_unscaledPoints[i] = btVector3(point[0], point[1], point[2]);
+		pointsAddress += stride;
 	}
 
 	recalcLocalAabb();
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index 1c4faf04441..ea3c13da611 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -24,10 +24,12 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC include src)
+SET(INC
+	./include
+)
 
 IF(UNIX)
-	SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+	LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
 ENDIF(UNIX)
 
 SET(SRC
@@ -37,4 +39,3 @@ SET(SRC
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
 BLENDERLIB(extern_glew "${SRC}" "${INC}")
-
diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt
index 0a985aceb37..8cdd804dfba 100644
--- a/extern/libopenjpeg/CMakeLists.txt
+++ b/extern/libopenjpeg/CMakeLists.txt
@@ -24,9 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . src)
+SET(INC .)
 
-FILE(GLOB SRC *.c except t1_generate_luts.c)
-ADD_DEFINITIONS(-DWITH_OPENJPEG)
-BLENDERLIB(extern_libopenjpeg "${SRC}" "${INC}")
-#, libtype=['international','player'], priority=[5, 210])
+FILE(GLOB SRC *.c)
+BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript
index da661739783..f5c1f4f48ba 100644
--- a/extern/libopenjpeg/SConscript
+++ b/extern/libopenjpeg/SConscript
@@ -11,15 +11,15 @@ flags = []
 defs = []
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	flags = []
-	defs.append('OPJ_STATIC')
+    flags = []
+    defs.append('OPJ_STATIC')
 else:
-	flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
+    flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
 
 oj_env = env.Clone()
 if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-	oj_env.Replace(CCFLAGS = '')
-	oj_env.Replace(BF_DEBUG_FLAGS = '')
+    oj_env.Replace(CCFLAGS = '')
+    oj_env.Replace(BF_DEBUG_FLAGS = '')
 
 oj_env.BlenderLib ( libname='extern_openjpeg', 
                     sources=sources, includes=Split(incs),
diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt
index 235cd8c7f8e..15aa5264e37 100644
--- a/extern/lzma/CMakeLists.txt
+++ b/extern/lzma/CMakeLists.txt
@@ -28,7 +28,4 @@ SET(INC . )
 
 FILE(GLOB SRC ./*.c)
 
-
-
-BLENDERLIB(bf_lzma "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+BLENDERLIB(extern_lzma "${SRC}" "${INC}")
diff --git a/extern/lzma/SConscript b/extern/lzma/SConscript
index 015cdfe339f..d0cfed87cb6 100644
--- a/extern/lzma/SConscript
+++ b/extern/lzma/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('./*.c')
 defs = ''
 incs = ' . ' 
 
-env.BlenderLib ('bf_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
+env.BlenderLib ('extern_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt
index b640cf658da..1563300d509 100644
--- a/extern/lzo/CMakeLists.txt
+++ b/extern/lzo/CMakeLists.txt
@@ -25,10 +25,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 SET(INC include)
+SET(SRC minilzo/minilzo.c)
 
-FILE(GLOB SRC minilzo/*.c)
-
-
-
-BLENDERLIB(bf_minilzo "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
diff --git a/extern/lzo/SConscript b/extern/lzo/SConscript
index 81bedad25d8..a87034d197a 100644
--- a/extern/lzo/SConscript
+++ b/extern/lzo/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('minilzo/*.c')
 defs = ''
 incs = ' include ' 
 
-env.BlenderLib ('bf_minilzo', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
+env.BlenderLib ('extern_minilzo', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )