meson: fix compat sources when compiling with MSVC
In our compat library we have both "msvc.c" and "mingw.c". The former is mostly a thin wrapper around the latter as it directly includes it, but it has a couple of extra headers that aren't included in "mingw.c" and is expected to be used with the Visual Studio compiler toolchain. While our Makefile knows to pick up the correct file depending on whether or not the Visual Studio toolchain is used, we don't do the same with Meson. Fix this. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
4b68faf6b9
commit
871491f7ad
|
|
@ -1107,7 +1107,6 @@ if host_machine.system() == 'cygwin'
|
|||
]
|
||||
elif host_machine.system() == 'windows'
|
||||
libgit_sources += [
|
||||
'compat/mingw.c',
|
||||
'compat/winansi.c',
|
||||
'compat/win32/dirent.c',
|
||||
'compat/win32/flush.c',
|
||||
|
|
@ -1134,6 +1133,9 @@ elif host_machine.system() == 'windows'
|
|||
libgit_include_directories += 'compat/win32'
|
||||
if compiler.get_id() == 'msvc'
|
||||
libgit_include_directories += 'compat/vcbuild/include'
|
||||
libgit_sources += 'compat/msvc.c'
|
||||
else
|
||||
libgit_sources += 'compat/mingw.c'
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue