Browse Source

Fix glib under windows

Signed-off-by: falkTX <falktx@falktx.com>
pull/25/head
falkTX 3 years ago
parent
commit
c9272a1760
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 26 additions and 1 deletions
  1. +1
    -1
      .github/workflows/bootstrap.yml
  2. +25
    -0
      patches/glib/win32/03_no-dllmain.patch

+ 1
- 1
.github/workflows/bootstrap.yml View File

@@ -8,7 +8,7 @@ on:
branches:
- '*'
env:
CACHE_VERSION: 3
CACHE_VERSION: 4
DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1
PAWPAW_SKIP_LTO: 1


+ 25
- 0
patches/glib/win32/03_no-dllmain.patch View File

@@ -0,0 +1,25 @@
diff --git a/glib/glib-init.c b/glib/glib-init.c
index e7002e6..12f94f2 100644
--- a/glib/glib-init.c
+++ b/glib/glib-init.c
@@ -236,7 +236,7 @@ glib_init (void)
g_quark_init ();
}
-#if defined (G_OS_WIN32)
+#if 0
BOOL WINAPI DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
@@ -284,6 +284,11 @@ G_DEFINE_CONSTRUCTOR(glib_init_ctor)
static void
glib_init_ctor (void)
{
+ glib_dll = NULL;
+ g_clock_win32_init ();
+#ifdef THREADS_WIN32
+ g_thread_win32_init ();
+#endif
glib_init ();
}

Loading…
Cancel
Save