zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

all: revert cimport workaround

Browse source
This commit is contained in:
Ali Chraghi 2022-09-07 23:48:43 +04:30 • committed by Stephen Gutekanst
parent 0a32de381e
commit ad981944d4
12 changed files with 29 additions and 94228 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libs/freetype/src/c.zig
View file

@ -1,17 +1,10 @@
pub usingnamespace if (@import("builtin").zig_backend == .stage1 or !@import("builtin").target.isDarwin())
@cImport({
@cInclude("freetype/ftadvanc.h");
@cInclude("freetype/ftbbox.h");
@cInclude("freetype/ftbitmap.h");
@cInclude("freetype/ftcolor.h");
@cInclude("freetype/ftlcdfil.h");
@cInclude("freetype/ftsizes.h");
@cInclude("freetype/ftstroke.h");
@cInclude("freetype/fttrigon.h");
})
else
// TODO(self-hosted): HACK: workaround https://github.com/ziglang/zig/issues/12483
//
// Extracted from a build using stage1 from zig-cache/ (`cimport.zig`)
// Then find+replace `= ?fn` -> `= ?*const fn`
@import("cimport1.zig");
pub usingnamespace @cImport({
@cInclude("freetype/ftadvanc.h");
@cInclude("freetype/ftbbox.h");
@cInclude("freetype/ftbitmap.h");
@cInclude("freetype/ftcolor.h");
@cInclude("freetype/ftlcdfil.h");
@cInclude("freetype/ftsizes.h");
@cInclude("freetype/ftstroke.h");
@cInclude("freetype/fttrigon.h");
});

6197
libs/freetype/src/cimport1.zig
View file

File diff suppressed because it is too large Load diff

9
libs/freetype/src/harfbuzz/c.zig
View file

@ -1,8 +1 @@
pub usingnamespace if (@import("builtin").zig_backend == .stage1 or !@import("builtin").target.isDarwin())
@cImport(@cInclude("hb-ft.h"))
else
// TODO(self-hosted): HACK: workaround https://github.com/ziglang/zig/issues/12483
//
// Extracted from a build using stage1 from zig-cache/ (`cimport.zig`)
// Then find+replace `= ?fn` -> `= ?*const fn`
@import("cimport1.zig");
pub usingnamespace @cImport(@cInclude("hb-ft.h"));

6197
libs/freetype/src/harfbuzz/cimport1.zig
View file

File diff suppressed because it is too large Load diff