From 9d3e080b978622b5d4f8cf21e382ca3399a9f847 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Wed, 2 Sep 2026 23:51:47 -0400 Subject: [PATCH 01/10] Update CI script --- .github/workflows/build-and-test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index a00cf55..05aa2ad 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -15,7 +15,7 @@ jobs: matrix: platform: [Win32, x64] configuration: [Debug, Release] - runner: [windows-2022] # TODO: Add windows-2019, which errors on Platform Toolset = 'v143' missing. + runner: [windows-2025-vs2026, windows-11-vs2026-arm] runs-on: ${{ matrix.runner }} steps: @@ -38,9 +38,9 @@ jobs: Linux: strategy: matrix: - platform: [X86-64] # TODO: Add X86, AArch32, and AArch64 platforms + platform: [X86-64] compiler: [Clang, GCC] - runner: [ubuntu-22.04, ubuntu-20.04] + runner: [ubuntu-26.04, ubuntu-26.04-arm, ubuntu-24.04, ubuntu-24.04-arm, ubuntu-22.04, ubuntu-22.04-arm] runs-on: ${{ matrix.runner }} steps: From 7ca2e855300ce9fdafbeff3d061aec95b78a623e Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Wed, 2 Sep 2026 23:58:38 -0400 Subject: [PATCH 02/10] Update project files to latest VS --- .../ControlGalleryExample/ControlGalleryExample.vcxproj | 8 ++++---- .../CustomPaintingExample/CustomPaintingExample.vcxproj | 8 ++++---- Projects/VisualStudio/OpenGLExample/OpenGLExample.vcxproj | 8 ++++---- Projects/VisualStudio/SimpleExample/SimpleExample.vcxproj | 8 ++++---- .../VisualStudio/StylingExample/StylingExample.vcxproj | 8 ++++---- Projects/VisualStudio/maxGUI/maxGUI.vcxproj | 8 ++++---- .../maxGUIAutomatedTests/maxGUIAutomatedTests.vcxproj | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Projects/VisualStudio/ControlGalleryExample/ControlGalleryExample.vcxproj b/Projects/VisualStudio/ControlGalleryExample/ControlGalleryExample.vcxproj index dd372da..f55834c 100644 --- a/Projects/VisualStudio/ControlGalleryExample/ControlGalleryExample.vcxproj +++ b/Projects/VisualStudio/ControlGalleryExample/ControlGalleryExample.vcxproj @@ -32,26 +32,26 @@ Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode diff --git a/Projects/VisualStudio/CustomPaintingExample/CustomPaintingExample.vcxproj b/Projects/VisualStudio/CustomPaintingExample/CustomPaintingExample.vcxproj index ac535ec..e4b3846 100644 --- a/Projects/VisualStudio/CustomPaintingExample/CustomPaintingExample.vcxproj +++ b/Projects/VisualStudio/CustomPaintingExample/CustomPaintingExample.vcxproj @@ -32,26 +32,26 @@ Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode diff --git a/Projects/VisualStudio/OpenGLExample/OpenGLExample.vcxproj b/Projects/VisualStudio/OpenGLExample/OpenGLExample.vcxproj index 0e3de89..5078407 100644 --- a/Projects/VisualStudio/OpenGLExample/OpenGLExample.vcxproj +++ b/Projects/VisualStudio/OpenGLExample/OpenGLExample.vcxproj @@ -147,14 +147,14 @@ Application false - v143 + v145 true Unicode Application false - v143 + v145 true Unicode @@ -175,14 +175,14 @@ Application false - v143 + v145 true Unicode Application false - v143 + v145 true Unicode diff --git a/Projects/VisualStudio/SimpleExample/SimpleExample.vcxproj b/Projects/VisualStudio/SimpleExample/SimpleExample.vcxproj index 1e73afe..bc0b23f 100644 --- a/Projects/VisualStudio/SimpleExample/SimpleExample.vcxproj +++ b/Projects/VisualStudio/SimpleExample/SimpleExample.vcxproj @@ -32,26 +32,26 @@ Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode diff --git a/Projects/VisualStudio/StylingExample/StylingExample.vcxproj b/Projects/VisualStudio/StylingExample/StylingExample.vcxproj index 0284e7d..fb6770b 100644 --- a/Projects/VisualStudio/StylingExample/StylingExample.vcxproj +++ b/Projects/VisualStudio/StylingExample/StylingExample.vcxproj @@ -32,26 +32,26 @@ Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode diff --git a/Projects/VisualStudio/maxGUI/maxGUI.vcxproj b/Projects/VisualStudio/maxGUI/maxGUI.vcxproj index e6743f2..e0bdebb 100644 --- a/Projects/VisualStudio/maxGUI/maxGUI.vcxproj +++ b/Projects/VisualStudio/maxGUI/maxGUI.vcxproj @@ -141,26 +141,26 @@ StaticLibrary true - v143 + v145 Unicode StaticLibrary false - v143 + v145 true Unicode StaticLibrary true - v143 + v145 Unicode StaticLibrary false - v143 + v145 true Unicode diff --git a/Projects/VisualStudio/maxGUIAutomatedTests/maxGUIAutomatedTests.vcxproj b/Projects/VisualStudio/maxGUIAutomatedTests/maxGUIAutomatedTests.vcxproj index 2210f7d..ea6ab67 100644 --- a/Projects/VisualStudio/maxGUIAutomatedTests/maxGUIAutomatedTests.vcxproj +++ b/Projects/VisualStudio/maxGUIAutomatedTests/maxGUIAutomatedTests.vcxproj @@ -32,26 +32,26 @@ Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode Application true - v143 + v145 Unicode Application false - v143 + v145 true Unicode From b42b9f2d5d713ad9d0d72e150c247b87fe01869b Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 00:12:12 -0400 Subject: [PATCH 03/10] Include to satisfy GCC header changes --- Code/maxGUI/ButtonImplementation.hpp | 1 + Code/maxGUI/CheckBoxImplementation.hpp | 1 + Code/maxGUI/DropDownBoxImplementation.hpp | 1 + Code/maxGUI/ListBoxImplementation.hpp | 1 + Code/maxGUI/MultilineTextBoxImplementation.hpp | 1 + Code/maxGUI/RadioButtonImplementation.hpp | 1 + Code/maxGUI/TextBoxImplementation.hpp | 1 + 7 files changed, 7 insertions(+) diff --git a/Code/maxGUI/ButtonImplementation.hpp b/Code/maxGUI/ButtonImplementation.hpp index 14f1277..5b2f310 100644 --- a/Code/maxGUI/ButtonImplementation.hpp +++ b/Code/maxGUI/ButtonImplementation.hpp @@ -5,6 +5,7 @@ #ifndef MAXGUI_BUTTONIMPLEMENTATION_HPP #define MAXGUI_BUTTONIMPLEMENTATION_HPP +#include #include #include diff --git a/Code/maxGUI/CheckBoxImplementation.hpp b/Code/maxGUI/CheckBoxImplementation.hpp index 04fec73..14ce26b 100644 --- a/Code/maxGUI/CheckBoxImplementation.hpp +++ b/Code/maxGUI/CheckBoxImplementation.hpp @@ -5,6 +5,7 @@ #ifndef MAXGUI_CHECKBOXIMPLEMENTATION_HPP #define MAXGUI_CHECKBOXIMPLEMENTATION_HPP +#include #include #include diff --git a/Code/maxGUI/DropDownBoxImplementation.hpp b/Code/maxGUI/DropDownBoxImplementation.hpp index 7b0fa91..92f8ac7 100644 --- a/Code/maxGUI/DropDownBoxImplementation.hpp +++ b/Code/maxGUI/DropDownBoxImplementation.hpp @@ -5,6 +5,7 @@ #ifndef MAXGUI_DROPDOWNBOXIMPLEMENTATION_HPP #define MAXGUI_DROPDOWNBOXIMPLEMENTATION_HPP +#include #include #include diff --git a/Code/maxGUI/ListBoxImplementation.hpp b/Code/maxGUI/ListBoxImplementation.hpp index d57335a..fef6eb4 100644 --- a/Code/maxGUI/ListBoxImplementation.hpp +++ b/Code/maxGUI/ListBoxImplementation.hpp @@ -5,6 +5,7 @@ #ifndef MAXGUI_LISTBOXIMPLEMENTATION_HPP #define MAXGUI_LISTBOXIMPLEMENTATION_HPP +#include #include #include diff --git a/Code/maxGUI/MultilineTextBoxImplementation.hpp b/Code/maxGUI/MultilineTextBoxImplementation.hpp index 0643200..60cd63a 100644 --- a/Code/maxGUI/MultilineTextBoxImplementation.hpp +++ b/Code/maxGUI/MultilineTextBoxImplementation.hpp @@ -5,6 +5,7 @@ #ifndef MAXGUI_MULTILINETEXTBOXIMPLEMENTATION_HPP #define MAXGUI_MULTILINETEXTBOXIMPLEMENTATION_HPP +#include #include #include diff --git a/Code/maxGUI/RadioButtonImplementation.hpp b/Code/maxGUI/RadioButtonImplementation.hpp index de5f465..b548c9f 100644 --- a/Code/maxGUI/RadioButtonImplementation.hpp +++ b/Code/maxGUI/RadioButtonImplementation.hpp @@ -5,6 +5,7 @@ #ifndef MAXGUI_RADIOBUTTONIMPLEMENTATION_HPP #define MAXGUI_RADIOBUTTONIMPLEMENTATION_HPP +#include #include #include diff --git a/Code/maxGUI/TextBoxImplementation.hpp b/Code/maxGUI/TextBoxImplementation.hpp index eed1ff0..eddc086 100644 --- a/Code/maxGUI/TextBoxImplementation.hpp +++ b/Code/maxGUI/TextBoxImplementation.hpp @@ -5,6 +5,7 @@ #ifndef MAXGUI_TEXTBOXIMPLEMENTATION_HPP #define MAXGUI_TEXTBOXIMPLEMENTATION_HPP +#include #include #include From 7e17a1f42083e2606fd047aff22ae251e888d189 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 00:16:52 -0400 Subject: [PATCH 04/10] Try installing more dependencies for building QT --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 05aa2ad..2b8c092 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -55,7 +55,7 @@ jobs: - name: Install Qt 5 run: | sudo apt update - sudo apt install qtbase5-dev + sudo apt install -y libxcb-xinerama0 libgl1-mesa-dev libxkbcommon-x11-0 qtbase5-dev - name: Find Qt run: | From b60b75b227c6a730894d2406cecdeb56c7357b26 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 00:35:26 -0400 Subject: [PATCH 05/10] Try QT6 --- .github/workflows/build-and-test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 2b8c092..43e9f71 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -55,11 +55,11 @@ jobs: - name: Install Qt 5 run: | sudo apt update - sudo apt install -y libxcb-xinerama0 libgl1-mesa-dev libxkbcommon-x11-0 qtbase5-dev + sudo apt install -y qt6-base-dev qt6-declarative-dev libgl1-mesa-dev - - name: Find Qt - run: | - find /usr/include -name QWidget + #- name: Find Qt + # run: | + # find /usr/include -name QWidget - name: Build #env: From ec9f080060cf185aa80f351ab0836aa8cbb78061 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 00:39:50 -0400 Subject: [PATCH 06/10] Correct Include pathsg --- .github/workflows/build-and-test.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 43e9f71..1040fa8 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -55,11 +55,12 @@ jobs: - name: Install Qt 5 run: | sudo apt update - sudo apt install -y qt6-base-dev qt6-declarative-dev libgl1-mesa-dev + sudo apt install qtbase5-dev - #- name: Find Qt - # run: | - # find /usr/include -name QWidget + # This is useful for finding the include path on different systems + - name: Find Qt + run: | + find /usr/include -name QWidget - name: Build #env: From 7c5bc3561e5906b59c8b9f508f834f521daeb1a5 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 00:42:17 -0400 Subject: [PATCH 07/10] Update Makefile Includes --- Projects/Make/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Projects/Make/Makefile b/Projects/Make/Makefile index 4db74b9..db8035f 100644 --- a/Projects/Make/Makefile +++ b/Projects/Make/Makefile @@ -33,7 +33,11 @@ INCLUDE_PATHS = \ /usr/include/x86_64-linux-gnu/qt5/QtWidgets \ /usr/include/x86_64-linux-gnu/qt5 \ /usr/include/x86_64-linux-gnu/QtCore \ - /usr/include/x86_64-linux-gnu/QtGui + /usr/include/x86_64-linux-gnu/QtGui \ + /usr/include/aarch64-linux-gnu/qt5/QtWidgets \ + /usr/include/aarch64-linux-gnu/qt5 \ + /usr/include/aarch64-linux-gnu/QtCode \ + /usr/include/aarch64-linux-gnu/QtGui INCLUDE_PATHS_FLAGS = $(foreach d, $(INCLUDE_PATHS), -I$d) LIBRARY_PATHS = \ From 7f157a9c2444f86244359cc649c4832ce9c6a5bf Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 00:52:21 -0400 Subject: [PATCH 08/10] Find library --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 1040fa8..8045fdf 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -60,7 +60,7 @@ jobs: # This is useful for finding the include path on different systems - name: Find Qt run: | - find /usr/include -name QWidget + find /usr/lib -name libQt5Core.so - name: Build #env: From 5eb3b78f4ed4afe0671c4b0efbcbf964cecac3be Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 01:09:35 -0400 Subject: [PATCH 09/10] Ignore Ubuntu ARM builds for now --- .github/workflows/build-and-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 8045fdf..ccd662f 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -40,7 +40,7 @@ jobs: matrix: platform: [X86-64] compiler: [Clang, GCC] - runner: [ubuntu-26.04, ubuntu-26.04-arm, ubuntu-24.04, ubuntu-24.04-arm, ubuntu-22.04, ubuntu-22.04-arm] + runner: [ubuntu-26.04, ubuntu-24.04, ubuntu-22.04,] # TODO: Add these once ARM builds are working: ubuntu-26.04-arm, ubuntu-24.04-arm, ubuntu-22.04-arm runs-on: ${{ matrix.runner }} steps: @@ -60,7 +60,7 @@ jobs: # This is useful for finding the include path on different systems - name: Find Qt run: | - find /usr/lib -name libQt5Core.so + find /usr/include -name QtWidget - name: Build #env: From 292d1422296a9a3175212456e65d86fd79401947 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Thu, 3 Sep 2026 01:13:30 -0400 Subject: [PATCH 10/10] Return QT search to include path --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index ccd662f..29f2fec 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -60,7 +60,7 @@ jobs: # This is useful for finding the include path on different systems - name: Find Qt run: | - find /usr/include -name QtWidget + find /usr/include -name QWidget - name: Build #env: