freetype: improve build system

freetype/src/c.zig

@@ -1,11 +1,8 @@
 pub usingnamespace @cImport({
-    @cInclude("freetype/freetype.h");
+    @cInclude("hb-ft.h");
     @cInclude("freetype/ftbbox.h");
     @cInclude("freetype/ftcolor.h");
     @cInclude("freetype/ftlcdfil.h");
-    @cInclude("freetype/ftmodapi.h");
     @cInclude("freetype/ftsizes.h");
     @cInclude("freetype/ftstroke.h");
-    @cInclude("freetype/ftsystem.h");
-    @cInclude("ft2build.h");
 });

freetype/src/freetype/Face.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const utils = @import("utils");
-const c = @import("c.zig");
+const c = @import("c");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const GlyphSlot = @import("freetype.zig").GlyphSlot;

freetype/src/freetype/Glyph.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Stroker = @import("Stroker.zig");

freetype/src/freetype/GlyphSlot.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Glyph = @import("Glyph.zig");

freetype/src/freetype/Library.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Stroker = @import("Stroker.zig");

freetype/src/freetype/Outline.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 const intToError = @import("error.zig").intToError;
 const errorToInt = @import("error.zig").errorToInt;
 const Error = @import("error.zig").Error;

freetype/src/freetype/Stroker.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 
 const Stroker = @This();
 

freetype/src/freetype/color.zig

@@ -1,5 +1,5 @@
 const utils = @import("utils");
-const c = @import("c.zig");
+const c = @import("c");
 const Face = @import("freetype.zig").Face;
 
 pub const Color = c.FT_Color;

freetype/src/freetype/error.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const Error = error{
     CannotOpenResource,

freetype/src/freetype/freetype.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const utils = @import("utils");
-const c = @import("c.zig");
+const c = @import("c");
 const intToError = @import("error.zig").intToError;
 const Error = @import("error.zig").Error;
 const Generic = @import("types.zig").Generic;

freetype/src/freetype/image.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const Outline = @import("Outline.zig");
 

freetype/src/freetype/lcdfilter.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const LcdFilter = enum(u5) {
     none = c.FT_LCD_FILTER_NONE,

freetype/src/freetype/main.zig

@@ -3,7 +3,7 @@ pub usingnamespace @import("types.zig");
 pub usingnamespace @import("image.zig");
 pub usingnamespace @import("color.zig");
 pub usingnamespace @import("lcdfilter.zig");
-pub const c = @import("c.zig");
+pub const c = @import("c");
 pub const Glyph = @import("Glyph.zig");
 pub const Stroker = @import("Stroker.zig");
 pub const Error = @import("error.zig").Error;

freetype/src/freetype/types.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const Matrix = c.FT_Matrix;
 pub const Generic = c.FT_Generic;

freetype/src/harfbuzz/blob.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const MemoryMode = enum(u2) {
     duplicate = c.HB_MEMORY_MODE_DUPLICATE,

freetype/src/harfbuzz/buffer.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const utils = @import("utils");
-const c = @import("c.zig");
+const c = @import("c");
 const Direction = @import("common.zig").Direction;
 const Script = @import("common.zig").Script;
 const Language = @import("common.zig").Language;

freetype/src/harfbuzz/c.zig

@@ -1,3 +0,0 @@
-pub usingnamespace @cImport({
-    @cInclude("hb.h");
-});

freetype/src/harfbuzz/common.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const Direction = enum(u3) {
     invalid = c.HB_DIRECTION_INVALID,

freetype/src/harfbuzz/face.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 const Blob = @import("blob.zig").Blob;
 
 pub const UnicodeIterator = struct {

freetype/src/harfbuzz/font.zig

@@ -1,4 +1,4 @@
-const c = @import("c.zig");
+const c = @import("c");
 const Face = @import("face.zig").Face;
 const Buffer = @import("buffer.zig").Buffer;
 const Feature = @import("common.zig").Feature;

freetype/src/harfbuzz/main.zig

@@ -5,7 +5,7 @@ pub usingnamespace @import("face.zig");
 pub usingnamespace @import("font.zig");
 pub usingnamespace @import("shape.zig");
 pub usingnamespace @import("shape_plan.zig");
-pub const c = @import("c.zig");
+pub const c = @import("c");
 
 const utils = @import("utils");
 

freetype/src/harfbuzz/shape.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 
 pub const ListShapers = struct {
     index: usize,

freetype/src/harfbuzz/shape_plan.zig

@@ -1,5 +1,5 @@
 const std = @import("std");
-const c = @import("c.zig");
+const c = @import("c");
 const Buffer = @import("buffer.zig").Buffer;
 const Font = @import("font.zig").Font;
 const Face = @import("face.zig").Face;