From f723d48fe24f5d536dbc78fafa543d62a4063ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 20 Jun 2023 12:51:10 +0300 Subject: [PATCH] remove hardcoded cmph/config.h --- build.zig | 25 ++++++++++- include/deps/cmph/config.h | 86 -------------------------------------- 2 files changed, 24 insertions(+), 87 deletions(-) delete mode 100644 include/deps/cmph/config.h diff --git a/build.zig b/build.zig index 1cfe207..c62b07e 100644 --- a/build.zig +++ b/build.zig @@ -48,7 +48,30 @@ pub fn build(b: *zbs.Builder) void { cmph.compress_debug_sections = .zlib; cmph.omit_frame_pointer = true; cmph.addIncludePath("deps/cmph/src"); - cmph.addIncludePath("include/deps/cmph"); + cmph.addConfigHeader(b.addConfigHeader(.{}, .{ + .HAVE_DLFCN_H = true, + .HAVE_GETOPT_H = true, + .HAVE_INTTYPES_H = true, + .HAVE_MATH_H = true, + .HAVE_MEMORY_H = true, + .HAVE_STDINT_H = true, + .HAVE_STDLIB_H = true, + .HAVE_STRINGS_H = true, + .HAVE_STRING_H = true, + .HAVE_SYS_STAT_H = true, + .HAVE_SYS_TYPES_H = true, + .HAVE_UNISTD_H = true, + .LT_OBJDIR = ".libs/", + .PACKAGE = "cmph", + .PACKAGE_BUGREPORT = "", + .PACKAGE_NAME = "cmph", + .PACKAGE_STRING = "cmph 2.0.2", + .PACKAGE_TARNAME = "cmph", + .PACKAGE_URL = "", + .PACKAGE_VERSION = "2.0.2", + .STDC_HEADERS = 1, + .VERSION = "2.0.2", + })); const bdz = b.addStaticLibrary(.{ .name = "bdz", diff --git a/include/deps/cmph/config.h b/include/deps/cmph/config.h deleted file mode 100644 index 77afecc..0000000 --- a/include/deps/cmph/config.h +++ /dev/null @@ -1,86 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_GETOPT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_HOPSCOTCH_MAP_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `check' library (-lcheck). */ -/* #undef HAVE_LIBCHECK */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MATH_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if g++ supports C++0x features. */ -/* #undef HAVE_STDCXX_0X */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "cmph" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "cmph" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "cmph 2.0.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "cmph" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.2" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -#define VERSION "2.0.2" - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ - -/* Define to make fseeko etc. visible, on some hosts. */ -/* #undef _LARGEFILE_SOURCE */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */