Merging r45928 through r45935 from trunk into soc-2011-tomato

CMakeLists.txt

@@ -1008,10 +1008,8 @@ elseif(WIN32)
 
 		if(WITH_MINGW64)
 			#Yes, the point for MinGW64 is moar optimization by default :)
-			set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2")
-			set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
-			set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
-			#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+			set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -O3")
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
 			
 			add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)

build_files/scons/config/win64-mingw-config.py

@@ -176,7 +176,7 @@ CC = 'gcc'
 CXX = 'g++'
 
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-#CXXFLAGS = [ '-fpermissive' ]
+CXXFLAGS = [ '-fpermissive' ]
 
 CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-D_SSIZE_T_']
 REL_CFLAGS = ['-O3', '-mmmx', '-msse', '-msse2']

extern/bullet2/patches/MinGW64-nopermissive.patch

@@ -1,39 +0,0 @@
-Index: LinearMath/btSerializer.h
-===================================================================
---- LinearMath/btSerializer.h	(revision 45919)
-+++ LinearMath/btSerializer.h	(working copy)
-@@ -25,8 +25,15 @@
- #endif
- #include <string.h>
- 
-+#if defined(_WIN64)
-+#  ifdef __MINGW64__
-+#    include <basetsd.h>
-+#  endif
-+typedef __int64 int_ptr;
-+#else
-+typedef long int_ptr;
-+#endif
- 
--
- ///only the 32bit versions for now
- extern unsigned char sBulletDNAstr[];
- extern int sBulletDNAlen;
-@@ -247,7 +254,7 @@
- 				cp++;
- 			}
- 			{
--				nr= (long)cp;
-+				nr= (int_ptr)cp;
- 			//	long mask=3;
- 				nr= ((nr+3)&~3)-nr;
- 				while (nr--)
-@@ -282,7 +289,7 @@
- 			}
- 
- 		{
--				nr= (long)cp;
-+				nr= (int_ptr)cp;
- 			//	long mask=3;
- 				nr= ((nr+3)&~3)-nr;
- 				while (nr--)

extern/bullet2/patches/mingw64_scons.patch

@@ -1,13 +0,0 @@
-Index: SConscript
-===================================================================
---- SConscript	(revision 45919)
-+++ SConscript	(working copy)
-@@ -11,7 +11,7 @@
-     defs += ' WIN32 NDEBUG _WINDOWS'
-     #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
-     cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
--elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
-+elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross', 'win64-mingw'):
-     defs += ' NDEBUG'
-     cflags += ['-O2']
- elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'):

extern/bullet2/src/LinearMath/btSerializer.h

@@ -25,14 +25,7 @@ subject to the following restrictions:
 #endif
 #include <string.h>
 
-#if defined(_WIN64)
-#  ifdef __MINGW64__
-#    include <basetsd.h>
-#  endif
-typedef __int64 int_ptr;
-#else
-typedef long int_ptr;
-#endif
+
 
 ///only the 32bit versions for now
 extern unsigned char sBulletDNAstr[];
@@ -254,7 +247,7 @@ protected:
 				cp++;
 			}
 			{
-				nr= (int_ptr)cp;
+				nr= (long)cp;
 			//	long mask=3;
 				nr= ((nr+3)&~3)-nr;
 				while (nr--)
@@ -289,7 +282,7 @@ protected:
 			}
 
 		{
-				nr= (int_ptr)cp;
+				nr= (long)cp;
 			//	long mask=3;
 				nr= ((nr+3)&~3)-nr;
 				while (nr--)

intern/audaspace/intern/AUD_Buffer.cpp

@@ -33,16 +33,7 @@
 #include <cstring>
 #include <cstdlib>
 
-#if defined(_WIN64)
-#  ifdef __MINGW64__
-#    include <basetsd.h>
-#  endif
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
-#define AUD_ALIGN(a) (a + 16 - ((uint_ptr)a & 15))
+#define AUD_ALIGN(a) (a + 16 - ((long)a & 15))
 
 AUD_Buffer::AUD_Buffer(int size)
 {

intern/audaspace/patches/mingw64-nopermissive.patch

@@ -1,23 +0,0 @@
-Index: intern/AUD_Buffer.cpp
-===================================================================
---- intern/AUD_Buffer.cpp	(revision 45919)
-+++ intern/AUD_Buffer.cpp	(working copy)
-@@ -33,8 +33,17 @@
- #include <cstring>
- #include <cstdlib>
- 
--#define AUD_ALIGN(a) (a + 16 - ((long)a & 15))
-+#if defined(_WIN64)
-+#  ifdef __MINGW64__
-+#    include <basetsd.h>
-+#  endif
-+typedef unsigned __int64 uint_ptr;
-+#else
-+typedef unsigned long uint_ptr;
-+#endif
- 
-+#define AUD_ALIGN(a) (a + 16 - ((uint_ptr)a & 15))
-+
- AUD_Buffer::AUD_Buffer(int size)
- {
- 	m_size = size;

intern/elbeem/intern/ntl_geometrymodel.cpp

@@ -21,14 +21,7 @@
 #endif
 #endif // WIN32
 
-#if defined(_WIN64)
-#  ifdef __MINGW64__
-#    include <basetsd.h>
-#  endif
-typedef __int64 int_ptr;
-#else
-typedef long int_ptr;
-#endif
+
 /******************************************************************************
  * Default Constructor 
  *****************************************************************************/
@@ -171,7 +164,7 @@ int ntlGeometryObjModel::initModel(int numVertices, float *vertices, int numTria
 	}
 
 	//fprintf(stderr,"initModel DEBUG %d \n",channelSize);
-	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(int_ptr)(channelVertices) ,10);
+	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(long)(channelVertices) ,10);
 	if(channelVertices && (channelSize>0)) {
 		vector<ntlSetVec3f> aniverts;
 		vector<ntlSetVec3f> aninorms;

intern/elbeem/patches/mingw64_nopermissive.patch

@@ -1,29 +0,0 @@
-Index: intern/ntl_geometrymodel.cpp
-===================================================================
---- intern/ntl_geometrymodel.cpp	(revision 45919)
-+++ intern/ntl_geometrymodel.cpp	(working copy)
-@@ -21,7 +21,14 @@
- #endif
- #endif // WIN32
- 
--
-+#if defined(_WIN64)
-+#  ifdef __MINGW64__
-+#    include <basetsd.h>
-+#  endif
-+typedef __int64 int_ptr;
-+#else
-+typedef long int_ptr;
-+#endif
- /******************************************************************************
-  * Default Constructor 
-  *****************************************************************************/
-@@ -164,7 +171,7 @@
- 	}
- 
- 	//fprintf(stderr,"initModel DEBUG %d \n",channelSize);
--	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(long)(channelVertices) ,10);
-+	debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(int_ptr)(channelVertices) ,10);
- 	if(channelVertices && (channelSize>0)) {
- 		vector<ntlSetVec3f> aniverts;
- 		vector<ntlSetVec3f> aninorms;

source/blender/editors/object/object_group.c

@@ -65,7 +65,7 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 	Scene *scene= CTX_data_scene(C);
 	Object *ob= OBACT;
 	Group *group;
-	int ok = 0;
+	int ok = 0, cycle = 0;
 	
 	if (!ob) return OPERATOR_CANCELLED;
 	
@@ -76,7 +76,10 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 		if (object_in_group(ob, group)) {
 			/* Assign groups to selected objects */
 			CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
-				add_to_group(group, base->object, scene, base);
+				if (base->object->dup_group != group)
+					add_to_group(group, base->object, scene, base);
+				else
+					cycle = 1;
 				ok = 1;
 			}
 			CTX_DATA_END;
@@ -84,6 +87,8 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
 	}
 	
 	if (!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
+	if (cycle)
+		BKE_report(op->reports, RPT_WARNING, "Skipped some groups because of cycle detected");
 	
 	DAG_scene_sort(bmain, scene);
 	WM_event_add_notifier(C, NC_GROUP|NA_EDITED, NULL);

source/gameengine/Expressions/KX_HashedPtr.cpp

@@ -28,15 +28,13 @@
 /** \file gameengine/Expressions/KX_HashedPtr.cpp
  *  \ingroup expressions
  */
-#ifdef __MINGW64__
-#include <basetsd.h>
-#endif
+
 
 #include "KX_HashedPtr.h"
 
 unsigned int KX_Hash(void * inDWord)
 {
-#ifdef _WIN64
+#if defined(_WIN64) && !defined(FREE_WINDOWS64)
 	unsigned __int64 key = (unsigned __int64)inDWord;
 #else
 	unsigned long key = (unsigned long)inDWord;

source/gameengine/Ketsji/KX_GameObject.cpp

@@ -31,10 +31,7 @@
  */
 
 
-#if defined(_WIN64)
-#  ifdef __MINGW64__
-#    include <basetsd.h>
-#  endif
+#if defined(_WIN64) && !defined(FREE_WINDOWS64)
 typedef unsigned __int64 uint_ptr;
 #else
 typedef unsigned long uint_ptr;

source/gameengine/Ketsji/KX_IPO_SGController.cpp

@@ -31,10 +31,7 @@
  */
 
 
-#if defined(_WIN64)
-#  ifdef __MINGW64__
-#    include <basetsd.h>
-#  endif
+#if defined(_WIN64) && !defined(FREE_WINDOWS64)
 typedef unsigned __int64 uint_ptr;
 #else
 typedef unsigned long uint_ptr;