]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
meson: fix resource file compilation on Windows
authorEli Schwartz <eschwartz@archlinux.org>
Mon, 31 Jan 2022 01:42:35 +0000 (20:42 -0500)
committerEli Schwartz <eschwartz@archlinux.org>
Mon, 31 Jan 2022 02:50:42 +0000 (21:50 -0500)
It needs to know about the correct include directories on its own.

build/meson/lib/meson.build
build/meson/programs/meson.build

index 6b09337810183c216079419e5bbafbd88574aff5..bb761a4fc2f00783d02978ac1845b54341d1c231 100644 (file)
@@ -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',
index 5ccd679a16752e6e4c7288a308a2452363ab34d4..0704155d84568f2bdeb094de18b188d93d0677fe 100644 (file)
@@ -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