From 0e00ccc314faa6ad00e55c4a2b09adff5a8c9459 Mon Sep 17 00:00:00 2001 From: bhgv Date: Fri, 2 Mar 2018 03:36:20 +0200 Subject: ready to build and run in Linux as a regular emu --- include/freetype/config/ftstdlib.h | 4 ++++ include/freetype/freetype.h | 3 ++- include/png/lodepng.h | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/freetype/config/ftstdlib.h b/include/freetype/config/ftstdlib.h index 2cbfb82..e507450 100644 --- a/include/freetype/config/ftstdlib.h +++ b/include/freetype/config/ftstdlib.h @@ -60,9 +60,13 @@ #ifndef __WCHAR_TYPE__ typedef unsigned short wchar_t; #else + +#ifdef ANDROID typedef __WCHAR_TYPE__ wchar_t; #endif +#endif + #include #define UINT_MAX 0xffffffffU #define ULONG_MAX 0xffffffffUL diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 885634b..e8c5cf6 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -20,12 +20,13 @@ #define __FREETYPE_H__ #pragma incomplete _off_ /* it's too hard */ +#ifdef ANDROID typedef unsigned int size_t; //typedef unsigned short wchar_t; typedef signed int ptrdiff_t; //#define NULL ((void*)0) - +#endif /*************************************************************************/ /* */ diff --git a/include/png/lodepng.h b/include/png/lodepng.h index cf6667c..1548272 100644 --- a/include/png/lodepng.h +++ b/include/png/lodepng.h @@ -26,7 +26,9 @@ freely, subject to the following restrictions: #ifndef LODEPNG_H #define LODEPNG_H -#include /*for size_t*/ +//#include /*for size_t*/ +typedef unsigned int size_t; + extern const char* LODEPNG_VERSION_STRING; -- cgit v1.2.3