| Index: third_party/freetype/src/base/ftbase.c
|
| diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/fxft_ftbase.c b/third_party/freetype/src/base/ftbase.c
|
| similarity index 87%
|
| rename from core/src/fxge/fx_freetype/fxft2.5.01/src/base/fxft_ftbase.c
|
| rename to third_party/freetype/src/base/ftbase.c
|
| index 239223a7176590d44f6971dfe074056363e9ca74..5e5d70ec4b6e499081252d3075cc90da8458a9d4 100644
|
| --- a/core/src/fxge/fx_freetype/fxft2.5.01/src/base/fxft_ftbase.c
|
| +++ b/third_party/freetype/src/base/ftbase.c
|
| @@ -1,4 +1,3 @@
|
| -#if !defined(_FXFT_VERSION_) || _FXFT_VERSION_ == 2501
|
| /***************************************************************************/
|
| /* */
|
| /* ftbase.c */
|
| @@ -16,8 +15,8 @@
|
| /* */
|
| /***************************************************************************/
|
|
|
| -#define FT2_BUILD_LIBRARY
|
| -#include "../../include/ft2build.h"
|
| +
|
| +#include <ft2build.h>
|
|
|
| #define FT_MAKE_OPTION_SINGLE_OBJECT
|
|
|
| @@ -34,11 +33,9 @@
|
| #include "ftstream.c"
|
| #include "fttrigon.c"
|
| #include "ftutil.c"
|
| -#include "ftxf86.c"
|
|
|
| -#if defined( FT_MACINTOSH ) && !defined ( DARWIN_NO_CARBON )
|
| -/*#include "ftmac.c"*/
|
| +#ifdef FT_MACINTOSH
|
| +#include "ftmac.c"
|
| #endif
|
|
|
| /* END */
|
| -#endif
|
|
|