[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] GSoC-2019-moazin 3d66915 3/4: [sfnt, svg] Fix includes to al
From: |
Moazin Khatti |
Subject: |
[freetype2] GSoC-2019-moazin 3d66915 3/4: [sfnt, svg] Fix includes to allow a `multi' build. |
Date: |
Fri, 23 Aug 2019 08:02:40 -0400 (EDT) |
branch: GSoC-2019-moazin
commit 3d6691530d9fef211f939cb2fa09f5ee32df6bfb
Author: Moazin Khatti <address@hidden>
Commit: Moazin Khatti <address@hidden>
[sfnt,svg] Fix includes to allow a `multi' build.
---
src/sfnt/rules.mk | 1 +
src/sfnt/ttsvg.c | 3 +++
src/sfnt/ttsvg.h | 1 +
src/svg/ftsvg.c | 3 +++
src/svg/rules.mk | 1 +
5 files changed, 9 insertions(+)
diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index ee3314e..2699e0d 100644
--- a/src/sfnt/rules.mk
+++ b/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 \
diff --git a/src/sfnt/ttsvg.c b/src/sfnt/ttsvg.c
index da83168..df311d6 100644
--- a/src/sfnt/ttsvg.c
+++ b/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,
diff --git a/src/sfnt/ttsvg.h b/src/sfnt/ttsvg.h
index c54e048..2226f78 100644
--- a/src/sfnt/ttsvg.h
+++ b/src/sfnt/ttsvg.h
@@ -19,6 +19,7 @@
#define __TTSVG_H__
#include <ft2build.h>
+#include FT_INTERNAL_TRUETYPE_TYPES_H
FT_BEGIN_HEADER
diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c
index 2193852..8cc5691 100644
--- a/src/svg/ftsvg.c
+++ b/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
diff --git a/src/svg/rules.mk b/src/svg/rules.mk
index 869d500..5acad2d 100644
--- a/src/svg/rules.mk
+++ b/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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] GSoC-2019-moazin 3d66915 3/4: [sfnt, svg] Fix includes to allow a `multi' build.,
Moazin Khatti <=