ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ugly hack for compile bullet with 64-bit mingw until I will find better solution

Browse Source
This commit is contained in:
Deve 2015-10-13 00:55:11 +02:00
parent 375e7ea0ed
commit 407f29641c
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/bullet/src/LinearMath/btAlignedAllocator.cpp
View File

@ -58,15 +58,24 @@ static inline void btAlignedFreeDefault(void *ptr)
free(ptr); free(ptr);
} }
#else #else
static inline void *btAlignedAllocDefault(size_t size, int alignment) static inline void *btAlignedAllocDefault(size_t size, int alignment)
{ {
void *ret; void *ret;
char *real; char *real;
#ifdef __MINGW64__
uintptr_t offset;
#else
unsigned long offset; unsigned long offset;
#endif
real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1)); real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1));
if (real) { if (real) {
#ifdef __MINGW64__
offset = (alignment - (uintptr_t)(real + sizeof(void *))) & (alignment-1);
#else
offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1); offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
#endif
ret = (void *)((real + sizeof(void *)) + offset); ret = (void *)((real + sizeof(void *)) + offset);
*((void **)(ret)-1) = (void *)(real); *((void **)(ret)-1) = (void *)(real);
} else { } else {

12
lib/bullet/src/LinearMath/btSerializer.h
View File

@ -213,7 +213,11 @@ protected:
int *intPtr=0; int *intPtr=0;
short *shtPtr=0; short *shtPtr=0;
#ifdef __MINGW64__
char *cp = 0;int dataLen =0;intptr_t nr=0;
#else
char *cp = 0;int dataLen =0;long nr=0; char *cp = 0;int dataLen =0;long nr=0;
#endif
intPtr = (int*)m_dna; intPtr = (int*)m_dna;
/* /*
@ -247,7 +251,11 @@ protected:
cp++; cp++;
} }
{ {
#ifdef __MINGW64__
nr= (intptr_t)cp;
#else
nr= (long)cp; nr= (long)cp;
#endif
// long mask=3; // long mask=3;
nr= ((nr+3)&~3)-nr; nr= ((nr+3)&~3)-nr;
while (nr--) while (nr--)
@ -282,7 +290,11 @@ protected:
} }
{ {
#ifdef __MINGW64__
nr= (intptr_t)cp;
#else
nr= (long)cp; nr= (long)cp;
#endif
// long mask=3; // long mask=3;
nr= ((nr+3)&~3)-nr; nr= ((nr+3)&~3)-nr;
while (nr--) while (nr--)