meson: fix resource file compilation on Windows

It needs to know about the correct include directories on its own.
facebook · Jan 31, 2022 · 5b2c6c7 · 5b2c6c7
1 parent c9072dd
commit 5b2c6c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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