mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-08 01:39:36 +00:00
Initial android support (#17)
* Upload Android armv7 libs * Fix debug build * utlvector: fix undefined behavior * wscript: add --use-ccache option * wscript: store ccache in a separate directory * Propertly use gl4es * fontconfig: fix font detection * [android]remove fontconfig dependency * Add build guide for other platforms Co-authored-by: JusicP <slender87844@gmail.com> Co-authored-by: nillerusr <nillerusr@users.noreply.github.com>
This commit is contained in:
co-authored by
JusicP
nillerusr
parent
2a490d398c
commit
2c6669f5e3
@@ -39,7 +39,9 @@
|
||||
#define _NORMAL_BLOCK 1
|
||||
|
||||
#include <cstddef>
|
||||
#ifndef ANDROID
|
||||
#include <glob.h>
|
||||
#endif
|
||||
#include <new>
|
||||
#include <sys/types.h>
|
||||
#if !defined( DID_THE_OPERATOR_NEW )
|
||||
|
||||
@@ -390,7 +390,7 @@ extern "C"
|
||||
// ensures they are here even when linking against debug or release static libs
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifndef NO_MEMOVERRIDE_NEW_DELETE
|
||||
#ifdef OSX
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void *__cdecl operator new( size_t nSize ) throw (std::bad_alloc)
|
||||
#else
|
||||
void *__cdecl operator new( size_t nSize )
|
||||
@@ -404,7 +404,7 @@ void *__cdecl operator new( size_t nSize, int nBlockUse, const char *pFileName,
|
||||
return g_pMemAlloc->Alloc(nSize, pFileName, nLine);
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void __cdecl operator delete( void *pMem ) throw()
|
||||
#else
|
||||
void __cdecl operator delete( void *pMem )
|
||||
@@ -412,8 +412,7 @@ void __cdecl operator delete( void *pMem )
|
||||
{
|
||||
g_pMemAlloc->Free( pMem );
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void operator delete(void*pMem, std::size_t)
|
||||
#else
|
||||
void operator delete(void*pMem, std::size_t) throw()
|
||||
@@ -422,7 +421,7 @@ void operator delete(void*pMem, std::size_t) throw()
|
||||
g_pMemAlloc->Free( pMem );
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void *__cdecl operator new[]( size_t nSize ) throw (std::bad_alloc)
|
||||
#else
|
||||
void *__cdecl operator new[]( size_t nSize )
|
||||
@@ -436,7 +435,7 @@ void *__cdecl operator new[] ( size_t nSize, int nBlockUse, const char *pFileNam
|
||||
return g_pMemAlloc->Alloc(nSize, pFileName, nLine);
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void __cdecl operator delete[]( void *pMem ) throw()
|
||||
#else
|
||||
void __cdecl operator delete[]( void *pMem )
|
||||
|
||||
Reference in New Issue
Block a user