diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index a00cf55..29f2fec 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-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: @@ -57,6 +57,7 @@ jobs: sudo apt update sudo apt install qtbase5-dev + # This is useful for finding the include path on different systems - name: Find Qt run: | find /usr/include -name QWidget 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 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 = \ 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