tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too

This commit is contained in:
Antony Riakiotakis 2012-04-24 16:14:23 +00:00
parent 749d284b49
commit 4e6590067d
11 changed files with 13 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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)

2
build_files/scons/config/win64-mingw-config.py
View File

@ -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']

39
extern/bullet2/patches/MinGW64-nopermissive.patch vendored
View File

@ -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--)

13
extern/bullet2/src/LinearMath/btSerializer.h vendored
View File

@ -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--)

11
intern/audaspace/intern/AUD_Buffer.cpp
View File

@ -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)
{

23
intern/audaspace/patches/mingw64-nopermissive.patch
View File

@ -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;

11
intern/elbeem/intern/ntl_geometrymodel.cpp
View File

@ -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;

29
intern/elbeem/patches/mingw64_nopermissive.patch
View File

@ -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;

6
source/gameengine/Expressions/KX_HashedPtr.cpp
View File

@ -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;

5
source/gameengine/Ketsji/KX_GameObject.cpp
View File

@ -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;

5
source/gameengine/Ketsji/KX_IPO_SGController.cpp
View File

@ -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;