From 9db6c35ac5da772eb3bf0d9e5da674ac7faae32a Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Sat, 21 Mar 2026 10:59:20 -0300 Subject: [PATCH] build/windows: Fix installer one-arch support (for forks) after .iss unification This fixes a regression introduced by a19ef562 --- build/windows/installer/gimp-setup.iss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/windows/installer/gimp-setup.iss b/build/windows/installer/gimp-setup.iss index 6ec2a1d244..40d7926cda 100644 --- a/build/windows/installer/gimp-setup.iss +++ b/build/windows/installer/gimp-setup.iss @@ -395,13 +395,18 @@ Source: "{#MAIN_BUNDLE}\share\mypaint-data\*"; DestDir: "{app}\share\mypaint-dat #sub EmitBaseExecutables #if i == 1 + #ifdef ARM64_BUNDLE #define private BUNDLE ARM64_BUNDLE #define private COMPONENT "ARM64" + #endif #elif i == 2 + #ifdef X64_BUNDLE #define private BUNDLE X64_BUNDLE #define private COMPONENT "X64" + #endif #endif +#ifdef BUNDLE ; Required arch-specific components (compact installation) Source: "{#BUNDLE}\bin\libgimp*.dll"; DestDir: "{app}\bin"; Components: gimp{#COMPONENT}; Flags: {#COMMON_FLAGS} Source: "{#BUNDLE}\bin\gimp*.exe"; DestDir: "{app}\bin"; Components: gimp{#COMPONENT}; Flags: {#COMMON_FLAGS} @@ -439,6 +444,7 @@ Source: "{#BUNDLE}\lib\python{#PYTHON_VERSION}\*"; DestDir: "{app}\lib\python{#P #undef BUNDLE #undef COMPONENT +#endif #endsub #for {i = 1; i <= 2; i++} EmitBaseExecutables