Commit 58f7a4d1 authored by Philip Withnall's avatar Philip Withnall

Merge branch 'msvc-dirent' into 'master'

MSVC: Move dirent implementation to glib/dirent/

See merge request !588
parents 193cc669 ec93d9e1
Pipeline #51799 passed with stages
in 11 minutes and 39 seconds
......@@ -41,8 +41,7 @@
#include "glibintl.h"
#if defined (_MSC_VER) && !defined (HAVE_DIRENT_H)
#include "../build/win32/dirent/dirent.h"
#include "../build/win32/dirent/wdirent.c"
#include "dirent/dirent.h"
#endif
#include "glib-private.h" /* g_dir_open_with_errno, g_dir_new_from_dirp */
......
......@@ -222,6 +222,9 @@ if host_system == 'windows'
glib_sources += [glib_win_res]
glib_sources += files('gwin32.c', 'gspawn-win32.c', 'giowin32.c')
platform_deps = [winsock2, cc.find_library('winmm')]
if cc.get_id() == 'msvc'
glib_sources += files('dirent/wdirent.c')
endif
else
glib_sources += files('glib-unix.c', 'gspawn.c', 'giounix.c')
platform_deps = []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment