diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 20:14:23 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 20:14:23 +0400 |
| commit | 4e6590067d5c398479d0d041b3afacc26d24061d (patch) | |
| tree | 6b3bc29116a7212d4ab56367016f8b6e799b705f /intern/elbeem | |
| parent | 749d284b498fb1cde7996d712497ce478c978f3a (diff) | |
revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/ntl_geometrymodel.cpp | 11 | ||||
| -rw-r--r-- | intern/elbeem/patches/mingw64_nopermissive.patch | 29 |
2 files changed, 2 insertions, 38 deletions
diff --git a/intern/elbeem/intern/ntl_geometrymodel.cpp b/intern/elbeem/intern/ntl_geometrymodel.cpp index b518416b639..13220736b8e 100644 --- a/intern/elbeem/intern/ntl_geometrymodel.cpp +++ b/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; diff --git a/intern/elbeem/patches/mingw64_nopermissive.patch b/intern/elbeem/patches/mingw64_nopermissive.patch deleted file mode 100644 index a01e65d43e4..00000000000 --- a/intern/elbeem/patches/mingw64_nopermissive.patch +++ /dev/null @@ -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; |