early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,28 @@
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 3deac78..134ded9 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -30,7 +30,8 @@
#include <stdlib.h>
#ifdef G_OS_WIN32
-#include "win_iconv.c"
+#define USE_LIBICONV_GNU
+#include <iconv.h>
#endif
#ifdef G_PLATFORM_WIN32
diff --git a/meson.build b/meson.build
index d938ddf51..2ba256115 100644
--- a/meson.build
+++ b/meson.build
@@ -1914,7 +1914,8 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack)
# the built-in implementation
iconv_opt = get_option('iconv')
if host_system == 'windows'
- libiconv = []
+ libiconv = [cc.find_library('iconv')]
+ found_iconv = true
# We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need
# any external library for it
if iconv_opt != 'auto'