[sfnt,svg] Fix includes to allow a `multi' build.

src/sfnt/rules.mk

@@ -36,6 +36,7 @@ SFNT_DRV_SRC := $(SFNT_DIR)/pngshim.c  \
                 $(SFNT_DIR)/ttcmap.c   \
                 $(SFNT_DIR)/ttcolr.c   \
                 $(SFNT_DIR)/ttcpal.c   \
+                $(SFNT_DIR)/ttsvg.c    \
                 $(SFNT_DIR)/ttkern.c   \
                 $(SFNT_DIR)/ttload.c   \
                 $(SFNT_DIR)/ttmtx.c    \

src/sfnt/ttsvg.c

@@ -27,6 +27,7 @@
 #include <ft2build.h>
 #include FT_INTERNAL_STREAM_H
 #include FT_INTERNAL_OBJECTS_H
+#include FT_INTERNAL_DEBUG_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_GZIP_H
 #include FT_OTSVG_H
@@ -47,6 +48,8 @@
     FT_ULong  table_size;
   } Svg;
 
+#undef  FT_COMPONENT
+#define FT_COMPONENT  ttsvg
 
   FT_LOCAL_DEF( FT_Error )
   tt_face_load_svg( TT_Face    face,

src/sfnt/ttsvg.h

@@ -19,6 +19,7 @@
 #define __TTSVG_H__
 
 #include <ft2build.h>
+#include FT_INTERNAL_TRUETYPE_TYPES_H
 
 FT_BEGIN_HEADER
 

src/svg/ftsvg.c

@@ -17,11 +17,14 @@
 
 #include <ft2build.h>
 #include FT_INTERNAL_DEBUG_H
+#include FT_INTERNAL_SERVICE_H
 #include FT_SERVICE_PROPERTIES_H
 #include FT_OTSVG_H
 #include FT_INTERNAL_SVG_INTERFACE_H
 #include FT_BBOX_H
 
+#include "svgtypes.h"
+
 #ifdef FT_CONFIG_OPTION_DEFAULT_SVG
 #include <rsvg_port.h>
 #endif

src/svg/ftsvg.h

@@ -20,6 +20,7 @@
 
 #include <ft2build.h>
 #include FT_RENDER_H
+#include FT_INTERNAL_OBJECTS_H
 
 FT_BEGIN_HEADER
 

src/svg/rules.mk

@@ -82,6 +82,7 @@ DRV_OBJS_M += $(SVG_DRV_OBJ_M)
 
 ifeq ($(COMPILE_SVG_PORT), yes)
 DRV_OBJS_S += $(SVG_PORT_OBJ_S)
+DRV_OBJS_M += $(SVG_PORT_OBJ_S)
 endif
 
 # EOF