Merge pull request #700 from raggi/raggi/fontconfig-windows

pkg/fontconfig: move defines to fix x86_64-windows targets
This commit is contained in:
Mitchell Hashimoto
2023-10-18 20:29:29 -07:00
committed by GitHub

View File

@ -40,29 +40,13 @@ pub fn build(b: *std.Build) !void {
"-DHAVE_STDLIB_H", "-DHAVE_STDLIB_H",
"-DHAVE_STRING_H", "-DHAVE_STRING_H",
"-DHAVE_UNISTD_H", "-DHAVE_UNISTD_H",
"-DHAVE_SYS_STATVFS_H",
"-DHAVE_SYS_PARAM_H", "-DHAVE_SYS_PARAM_H",
"-DHAVE_SYS_MOUNT_H",
"-DHAVE_LINK",
"-DHAVE_MKSTEMP", "-DHAVE_MKSTEMP",
"-DHAVE_MKOSTEMP",
"-DHAVE__MKTEMP_S",
"-DHAVE_MKDTEMP",
"-DHAVE_GETOPT",
"-DHAVE_GETOPT_LONG",
//"-DHAVE_GETPROGNAME", //"-DHAVE_GETPROGNAME",
//"-DHAVE_GETEXECNAME", //"-DHAVE_GETEXECNAME",
"-DHAVE_RAND", "-DHAVE_RAND",
"-DHAVE_RANDOM",
"-DHAVE_LRAND48",
//"-DHAVE_RANDOM_R", //"-DHAVE_RANDOM_R",
"-DHAVE_RAND_R",
"-DHAVE_READLINK",
"-DHAVE_FSTATVFS",
"-DHAVE_FSTATFS",
"-DHAVE_LSTAT",
"-DHAVE_MMAP",
"-DHAVE_VPRINTF", "-DHAVE_VPRINTF",
"-DHAVE_FT_GET_BDF_PROPERTY", "-DHAVE_FT_GET_BDF_PROPERTY",
@ -116,17 +100,23 @@ pub fn build(b: *std.Build) !void {
}); });
} else { } else {
try flags.appendSlice(&.{ try flags.appendSlice(&.{
"-DHAVE_SYS_STATVFS_H", "-DHAVE_FSTATFS",
"-DHAVE_SYS_MOUNT_H", "-DHAVE_FSTATVFS",
"-DHAVE_GETOPT",
"-DHAVE_GETOPT_LONG",
"-DHAVE_LINK", "-DHAVE_LINK",
"-DHAVE_MKOSTEMP",
"-DHAVE_RANDOM",
"-DHAVE_LRAND48", "-DHAVE_LRAND48",
"-DHAVE_RAND_R",
"-DHAVE_READLINK",
"-DHAVE_LSTAT", "-DHAVE_LSTAT",
"-DHAVE_MKDTEMP",
"-DHAVE_MKOSTEMP",
"-DHAVE__MKTEMP_S",
"-DHAVE_MMAP", "-DHAVE_MMAP",
"-DHAVE_PTHREAD", "-DHAVE_PTHREAD",
"-DHAVE_RANDOM",
"-DHAVE_RAND_R",
"-DHAVE_READLINK",
"-DHAVE_SYS_MOUNT_H",
"-DHAVE_SYS_STATVFS_H",
"-DFC_CACHEDIR=\"/var/cache/fontconfig\"", "-DFC_CACHEDIR=\"/var/cache/fontconfig\"",
"-DFC_TEMPLATEDIR=\"/usr/share/fontconfig/conf.avail\"", "-DFC_TEMPLATEDIR=\"/usr/share/fontconfig/conf.avail\"",