Only build x86_64 FLP, skip the 32-bit one. FLP option in installer i…

…s disabled by default.
AuburnSounds · Dec 19, 2023 · 5a8d7a5 · 5a8d7a5
1 parent 5485580
commit 5a8d7a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/tools/dplug-build/source/main.d b/tools/dplug-build/source/main.d
@@ -502,13 +502,20 @@ int main(string[] args)
 
             foreach (size_t archCount, arch; architectures)
             {
-                // Only build x86_64 on Windows
+                // Only build x86_64 AAX on Windows
                 if (targetOS == OS.windows && configIsAAX(config) && (arch != Arch.x86_64) && !(legacyPT10 && arch == Arch.x86) )
                 {
                     cwritefln("info: Skipping architecture %s for AAX on Windows\n", arch);
                     continue;
                 }
 
+                // Only build x86_64 FLP on Windows
+                if (targetOS == OS.windows && configIsFLP(config) && (arch != Arch.x86_64))
+                {
+                    cwritefln("info: Skipping architecture %s for FLP on Windows\n", arch);
+                    continue;
+                }
+
                 // Does not try to build 32-bit under Mac
                 if (targetOS == OS.macOS)
                 {

diff --git a/tools/dplug-build/source/nsis.d b/tools/dplug-build/source/nsis.d
@@ -127,7 +127,10 @@ void generateWindowsInstaller(string outputDir,
     auto sections = packs.uniq!((p1, p2) => p1.format == p2.format);
     foreach(p; sections)
     {
-        content ~= `Section "` ~ p.title ~ `" Sec` ~ p.format ~ "\n";
+        // FLStudio format optional, and disabled by default.
+        bool optional = (p.format == "FLP");
+        string optionalFlag = optional ? "/o " : "";
+        content ~= `Section ` ~ optionalFlag ~ `"` ~ p.title ~ `" Sec` ~ p.format ~ "\n";
         content ~= "AddSize " ~ p.bytes.to!string ~ "\n";
         content ~= "SectionEnd\n";
     }