From 5b2c6c776acadcd86247fdaa3e48c11c6848263e Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 30 Jan 2022 20:42:35 -0500 Subject: [PATCH] meson: fix resource file compilation on Windows It needs to know about the correct include directories on its own. --- build/meson/lib/meson.build | 3 ++- build/meson/programs/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build index 6b093378..bb761a4f 100644 --- a/build/meson/lib/meson.build +++ b/build/meson/lib/meson.build @@ -83,7 +83,8 @@ libzstd_c_args = [] if cc_id == compiler_msvc if default_library_type != 'static' libzstd_sources += [windows_mod.compile_resources( - join_paths(zstd_rootdir, 'build/VS2010/libzstd-dll/libzstd-dll.rc'))] + join_paths(zstd_rootdir, 'build/VS2010/libzstd-dll/libzstd-dll.rc'), + include_directories: libzstd_includes)] libzstd_c_args += ['-DZSTD_DLL_EXPORT=1', '-DZSTD_HEAPMODE=0', '-D_CONSOLE', diff --git a/build/meson/programs/meson.build b/build/meson/programs/meson.build index 5ccd679a..0704155d 100644 --- a/build/meson/programs/meson.build +++ b/build/meson/programs/meson.build @@ -66,7 +66,8 @@ endif if cc_id == compiler_msvc if default_library_type != 'static' zstd_programs_sources += [windows_mod.compile_resources( - join_paths(zstd_rootdir, 'build/VS2010/zstd/zstd.rc'))] + join_paths(zstd_rootdir, 'build/VS2010/zstd/zstd.rc'), + include_directories: libzstd_includes)] endif endif