From 6f9ad5adef3171b79ffa05a67f98ba5ca239ae0c Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Sat, 6 Sep 2025 19:46:50 -0300 Subject: [PATCH] build/windows: Fix prefixes priority in libraries bundling (cherry picked from commit 013f9c7f0cc5574f569459ddc0126e66b79fad73) --- build/windows/2_bundle-gimp-uni_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/windows/2_bundle-gimp-uni_base.py b/build/windows/2_bundle-gimp-uni_base.py index 6ef5754c0e..3877b50188 100644 --- a/build/windows/2_bundle-gimp-uni_base.py +++ b/build/windows/2_bundle-gimp-uni_base.py @@ -198,12 +198,12 @@ done_dll.unlink(missing_ok=True) ### Deps (DLLs) of the binaries in 'bin' and 'lib' dirs for dir in ["bin", "lib"]: search_dir = GIMP_DISTRIB / dir - print(f"Searching for dependencies of {search_dir} in {MSYSTEM_PREFIX} and {GIMP_PREFIX}") + print(f"Searching for dependencies of {search_dir} in {GIMP_PREFIX} and {MSYSTEM_PREFIX}") for ext in ("*.dll", "*.exe"): for dep in search_dir.rglob(ext): subprocess.run([ sys.executable, f"{GIMP_SOURCE}/build/windows/2_bundle-gimp-uni_dep.py", - str(dep), f"{MSYSTEM_PREFIX}/", f"{GIMP_PREFIX}/", + str(dep), f"{GIMP_PREFIX}/", f"{MSYSTEM_PREFIX}/", str(GIMP_DISTRIB), "--output-dll-list", done_dll.as_posix() ], check=True)