Some more ARM64EC surge tweaks

1. A header fragility ordering thing wiht MSVC
2. A Rectangle ambiguity
3. Turn the pipeline back on for arm64ec PR

.github/workflows/build-pr.yml

@@ -27,12 +27,12 @@ jobs:
             cmakeOpt: DEBUG
             runTests: false
 
-          #- name: "windows msvc arm64ec"
-          #  os: windows-latest
-          #  target: surge-xt_Standalone
-          #  cmakeConfig: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 -DSURGE_SKIP_LUA=TRUE
-          #  cmakeOpt: DEBUG
-          #  runTests: false
+          - name: "windows msvc arm64ec"
+            os: windows-latest
+            target: surge-xt_Standalone
+            cmakeConfig: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 -DSURGE_SKIP_LUA=TRUE
+            cmakeOpt: DEBUG
+            runTests: false
 
           - name: "windows clang"
             os: windows-latest

CMakeLists.txt

@@ -176,6 +176,7 @@ if(MSVC)
     /wd4388   # signed unsigned mismatch in comparison
     /wd4065   # standalone default in a switch with no case
     /wd4702   # unreachable code. I generally do if( a ) return foo else return bar; return nullptr so don't warn on that
+    /wd4005   # macro redefinition. Thanks NOMINMAX
 
     # Clang-cl-only warnings
     $<$<CXX_COMPILER_ID:Clang>:-Wno-microsoft-exception-spec>

src/surge-xt/CMakeLists.txt

@@ -223,6 +223,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
   juce::juce_audio_processors
   juce::juce_audio_plugin_client
   juce::juce_osc
+  juce::juce_gui_basics
   surge-xt-binary
   sst-filters-extras
 )

src/surge-xt/gui/SurgeJUCELookAndFeel.cpp

@@ -20,6 +20,10 @@
  * https://github.com/surge-synthesizer/surge
  */
 
+
+#include <juce_gui_basics/juce_gui_basics.h>
+#include <juce_gui_extra/juce_gui_extra.h>
+
 #include "SurgeJUCELookAndFeel.h"
 #include "RuntimeFont.h"
 #include "SkinSupport.h"
@@ -253,12 +257,12 @@ void SurgeJUCELookAndFeel::drawDocumentWindowTitleBar(DocumentWindow &window, Gr
         icon->drawAt(g, titleCenter - (titleTextWidth / 2) - 14 - textMargin, h / 2 - 7, 1.0);
     }
 
-    auto boxSurge = Rectangle<int>(titleCenter - (titleTextWidth / 2), 0, sw, h);
+    auto boxSurge = juce::Rectangle<int>(titleCenter - (titleTextWidth / 2), 0, sw, h);
     g.setFont(fontSurge);
     g.drawText(surgeLabel, boxSurge, Justification::centredLeft);
 
     auto boxVersion =
-        Rectangle<int>(titleCenter - (titleTextWidth / 2) + sw + textMargin, 0, vw, h);
+        juce::Rectangle<int>(titleCenter - (titleTextWidth / 2) + sw + textMargin, 0, vw, h);
     g.setFont(fontVersion);
     g.drawText(surgeVersion, boxVersion, Justification::centredLeft);
 }
@@ -286,7 +290,7 @@ class SurgeJUCELookAndFeel_DocumentWindowButton : public Button
 
         auto reducedRect =
             Justification(Justification::centred)
-                .appliedToRectangle(Rectangle<int>(getHeight(), getHeight()), getLocalBounds())
+                .appliedToRectangle(juce::Rectangle<int>(getHeight(), getHeight()), getLocalBounds())
                 .toFloat()
                 .reduced((float)getHeight() * 0.25f);
 
@@ -360,7 +364,7 @@ juce::Font SurgeJUCELookAndFeel::getPopupMenuBoldFont()
 }
 
 // overridden here just to make the shortcut text same size as normal menu entry text
-void SurgeJUCELookAndFeel::drawPopupMenuItem(Graphics &g, const Rectangle<int> &area,
+void SurgeJUCELookAndFeel::drawPopupMenuItem(Graphics &g, const juce::Rectangle<int> &area,
                                              const bool isSeparator, const bool isActive,
                                              const bool isHighlighted, const bool isTicked,
                                              const bool hasSubMenu, const String &text,
@@ -479,7 +483,7 @@ void SurgeJUCELookAndFeel::updateDarkIfNeeded()
     }
 }
 void SurgeJUCELookAndFeel::drawPopupMenuSectionHeaderWithOptions(Graphics &graphics,
-                                                                 const Rectangle<int> &area,
+                                                                 const juce::Rectangle<int> &area,
                                                                  const String &sectionName,
                                                                  const PopupMenu::Options &options)
 {

src/surge-xt/gui/overlays/KeyBindingsOverlay.cpp

@@ -20,6 +20,8 @@
  * https://github.com/surge-synthesizer/surge
  */
 
+#include <juce_gui_basics/juce_gui_basics.h>
+#include <juce_gui_extra/juce_gui_extra.h>
 #include "KeyBindingsOverlay.h"
 #include <SurgeJUCELookAndFeel.h>
 #include "widgets/MenuCustomComponents.h"

src/surge-xt/gui/overlays/LuaEditors.h

@@ -27,13 +27,15 @@
 #ifndef SURGE_SRC_SURGE_XT_GUI_OVERLAYS_LUAEDITORS_H
 #define SURGE_SRC_SURGE_XT_GUI_OVERLAYS_LUAEDITORS_H
 
+#include <juce_gui_extra/juce_gui_extra.h>
+
 #include "SurgeStorage.h"
 #include "SkinSupport.h"
 
-#include "juce_gui_extra/juce_gui_extra.h"
 #include "OverlayComponent.h"
 #include "RefreshableOverlay.h"
 
+
 class SurgeGUIEditor;
 
 namespace Surge

src/surge-xt/gui/overlays/TuningOverlays.cpp

@@ -19,6 +19,9 @@
  * All source for Surge XT is available at
  * https://github.com/surge-synthesizer/surge
  */
+
+#include <juce_gui_extra/juce_gui_extra.h>
+
 #include "TuningOverlays.h"
 #include "RuntimeFont.h"
 #include "SurgeStorage.h"
@@ -29,7 +32,6 @@
 #include "widgets/MultiSwitch.h"
 #include "fmt/core.h"
 #include <chrono>
-#include "juce_gui_extra/juce_gui_extra.h"
 #include "UnitConversions.h"
 #include "libMTSClient.h"
 

src/surge-xt/osc/OpenSoundControl.cpp

@@ -20,6 +20,9 @@
  * https://github.com/surge-synthesizer/surge
  */
 
+
+#include <juce_gui_basics/juce_gui_basics.h>
+#include <juce_gui_extra/juce_gui_extra.h>
 #include "OpenSoundControl.h"
 #include "Parameter.h"
 #include "SurgeSynthProcessor.h"