From 3dd54d5fea4b3ac86b8b9551238ae2ab2c6551b3 Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Sat, 7 Feb 2026 08:45:47 -0700
Subject: [PATCH] Added additional Windows GTK glib-genmarshal discovery
 fallbacks for Python-based script locations to handle missing executables in
 common layouts. Broadened ATK import library detection to include
 libatk-1.0-0.lib for Win32 builds.

---
 win32/zoitechat.props | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/win32/zoitechat.props b/win32/zoitechat.props
index 267f69be..ad72202f 100644
--- a/win32/zoitechat.props
+++ b/win32/zoitechat.props
@@ -43,6 +43,8 @@
 		<LuaLib Condition="'$(LuaLib)'==''">lua51</LuaLib>
 		<GlibGenMarshal Condition="Exists('$(DepsRoot)\\bin\\glib-genmarshal.exe')">&quot;$(DepsRoot)\bin\glib-genmarshal.exe&quot;</GlibGenMarshal>
 		<GlibGenMarshal Condition="'$(GlibGenMarshal)'=='' and Exists('$(DepsRoot)\\bin\\glib-genmarshal')">&quot;$(DepsRoot)\bin\glib-genmarshal&quot;</GlibGenMarshal>
+		<GlibGenMarshal Condition="'$(GlibGenMarshal)'=='' and Exists('$(DepsRoot)\\bin\\glib-genmarshal.py')">&quot;$(Python3Path)\python.exe&quot; &quot;$(DepsRoot)\bin\glib-genmarshal.py&quot;</GlibGenMarshal>
+		<GlibGenMarshal Condition="'$(GlibGenMarshal)'=='' and Exists('$(DepsRoot)\\share\\glib-2.0\\codegen\\glib-genmarshal.py')">&quot;$(Python3Path)\python.exe&quot; &quot;$(DepsRoot)\share\glib-2.0\codegen\glib-genmarshal.py&quot;</GlibGenMarshal>
 		<GlibGenMarshal Condition="'$(GlibGenMarshal)'==''">&quot;$(Python3Path)\python.exe&quot; &quot;$(DepsRoot)\bin\glib-genmarshal&quot;</GlibGenMarshal>
 		<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
         <UsingGtk3 Condition="Exists('$(DepsRoot)\\include\\gtk-3.0\\gtk\\gtk.h')">true</UsingGtk3>
@@ -79,10 +81,12 @@
         <Gdk3Lib Condition="Exists('$(DepsRoot)\\lib\\gdk-3.0.lib')">gdk-3.0.lib</Gdk3Lib>
         <Gdk3Lib Condition="'$(Gdk3Lib)'=='' and Exists('$(DepsRoot)\\lib\\gdk-3-0.lib')">gdk-3-0.lib</Gdk3Lib>
         <Gdk3Lib Condition="'$(Gdk3Lib)'=='' and Exists('$(DepsRoot)\\lib\\gdk-3.lib')">gdk-3.lib</Gdk3Lib>
-      <AtkLib Condition="Exists('$(DepsRoot)\\lib\\atk-1.0.lib')">atk-1.0.lib</AtkLib>
+        <AtkLib Condition="Exists('$(DepsRoot)\\lib\\atk-1.0.lib')">atk-1.0.lib</AtkLib>
         <AtkLib Condition="'$(AtkLib)'=='' and Exists('$(DepsRoot)\\lib\\atk-1.0-0.lib')">atk-1.0-0.lib</AtkLib>
+        <AtkLib Condition="'$(AtkLib)'=='' and Exists('$(DepsRoot)\\lib\\libatk-1.0-0.lib')">libatk-1.0-0.lib</AtkLib>
         <AtkLib Condition="'$(AtkLib)'=='' and Exists('$(DepsRoot)\\lib\\libatk-1.0.lib')">libatk-1.0.lib</AtkLib>
         <AtkLib Condition="'$(AtkLib)'==''">atk-1.0.lib</AtkLib>
+        <AtkLib Condition="'$(AtkLib)'==''">atk-1.0.lib</AtkLib>
         <Gtk3Libs>$(Gtk3Lib);$(Gdk3Lib);$(AtkLib);gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;iconv.lib;$(ZlibLib);$(XmlLib);jpeg.lib;libpng16.lib;$(CryptoLib);$(SslLib)</Gtk3Libs>
 
         <DepLibs>$(Gtk3Libs);wininet.lib;winmm.lib;ws2_32.lib</DepLibs>