AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-12 09:06:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use better method of disabling freetype engine than just checking if __EMSCRIPTEN__ is defined

Browse Source
This commit is contained in:
UnknownShadow200 2022-07-14 22:03:53 +10:00
parent 23cf906203
commit f1e1a87d3d
16 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/String.h
View File

@ -176,7 +176,7 @@ cc_unichar Convert_CP437ToUnicode(char c);
/* Converts a unicode codepoint to its code page 437 equivalent, or '?' if no match. */ /* Converts a unicode codepoint to its code page 437 equivalent, or '?' if no match. */
char Convert_CodepointToCP437(cc_codepoint cp); char Convert_CodepointToCP437(cc_codepoint cp);
/* Attempts to convert a unicode codepoint to its code page 437 equivalent. */ /* Attempts to convert a unicode codepoint to its code page 437 equivalent. */
cc_bool Convert_TryCodepointToCP437(cc_codepoint cp, char* c); CC_API cc_bool Convert_TryCodepointToCP437(cc_codepoint cp, char* c);
/* Decodes a unicode codepoint from UTF8, returning number of bytes read. */ /* Decodes a unicode codepoint from UTF8, returning number of bytes read. */
/* Returns 0 if not enough input data to read the character. */ /* Returns 0 if not enough input data to read the character. */
int Convert_Utf8ToCodepoint(cc_codepoint* cp, const cc_uint8* data, cc_uint32 len); int Convert_Utf8ToCodepoint(cc_codepoint* cp, const cc_uint8* data, cc_uint32 len);

3
src/_autofit.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"

3
src/_cff.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"

3
src/_ftbase.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h" #include "freetype/ft2build.h"
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT

5
src/_ftbitmap.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h" #include "freetype/ft2build.h"
#include FT_INTERNAL_DEBUG_H_FT #include FT_INTERNAL_DEBUG_H_FT
@ -807,5 +808,5 @@
return FT_Err_Ok; return FT_Err_Ok;
} }
#endif
/* END */ /* END */

5
src/_ftglyph.c
View File

@ -27,7 +27,8 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h" #include "freetype/ft2build.h"
#include FT_INTERNAL_DEBUG_H_FT #include FT_INTERNAL_DEBUG_H_FT
@ -557,5 +558,5 @@
} }
} }
#endif
/* END */ /* END */

4
src/_ftinit.c
View File

@ -36,7 +36,8 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h" #include "freetype/ft2build.h"
#include FT_CONFIG_CONFIG_H_FT #include FT_CONFIG_CONFIG_H_FT
#include FT_INTERNAL_OBJECTS_H_FT #include FT_INTERNAL_OBJECTS_H_FT
@ -100,4 +101,5 @@
} }
} }
#endif
/* END */ /* END */

5
src/_ftsynth.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h" #include "freetype/ft2build.h"
#include FT_SYNTHESIS_H_FT #include FT_SYNTHESIS_H_FT
#include FT_INTERNAL_DEBUG_H_FT #include FT_INTERNAL_DEBUG_H_FT
@ -118,5 +119,5 @@
slot->bitmap_top += (FT_Int)( ystr >> 6 ); slot->bitmap_top += (FT_Int)( ystr >> 6 );
} }
#endif
/* END */ /* END */

3
src/_psaux.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"

3
src/_pshinter.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"

5
src/_psmodule.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#include "freetype/ft2build.h" #include "freetype/ft2build.h"
#include FT_INTERNAL_DEBUG_H_FT #include FT_INTERNAL_DEBUG_H_FT
#include FT_INTERNAL_OBJECTS_H_FT #include FT_INTERNAL_OBJECTS_H_FT
@ -614,5 +615,5 @@
(FT_Module_Requester) PUT_PS_NAMES_SERVICE( psnames_get_service ) /* get_interface */ (FT_Module_Requester) PUT_PS_NAMES_SERVICE( psnames_get_service ) /* get_interface */
) )
#endif
/* END */ /* END */

3
src/_raster.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"

5
src/_sfnt.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"
@ -26,6 +27,6 @@
#include "freetype/ttmtx.c" #include "freetype/ttmtx.c"
#include "freetype/ttpost.c" #include "freetype/ttpost.c"
#include "freetype/ttsbit.c" #include "freetype/ttsbit.c"
#endif
/* END */ /* END */

3
src/_smooth.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"

3
src/_truetype.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"

3
src/_type1.c
View File

@ -15,7 +15,8 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#ifndef __EMSCRIPTEN__ #include "Core.h"
#ifdef CC_BUILD_FREETYPE
#define FT_MAKE_OPTION_SINGLE_OBJECT #define FT_MAKE_OPTION_SINGLE_OBJECT
#include "freetype/ft2build.h" #include "freetype/ft2build.h"