Move StringTheory to Universal Binary

.github/workflows/build.yml

@@ -0,0 +1,57 @@
+name: Build StringTheory
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest]
+        qt-version: ["6.8.3"]
+        include:
+          - os: macos-latest
+            artifact: "./install/mac/*.dmg"
+          - os: windows-latest
+            artifact: "./install/win/*.exe"
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v6
+        with:
+          submodules: 'true'
+
+      - name: Set up Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ matrix.qt-version }}
+          modules: qtserialport
+
+      - name: Configure MSVC Environment
+        if: matrix.os == 'windows-latest'
+        uses: TheMrMilchmann/setup-msvc-dev@v4
+        with:
+          arch: x64
+      - name: Install NSIS
+        if: matrix.os == 'windows-latest'
+        uses: negrutiu/nsis-install@v2
+
+      - name: Configure project
+        run: qmake StringTheory.pro
+
+      - name: Build (Windows)
+        if: matrix.os == 'windows-latest'
+        run: nmake
+
+      - name: Build (macOS)
+        if: matrix.os == 'macos-latest'
+        shell: bash
+        run: make -j$(sysctl -n hw.ncpu)
+
+      - name: Upload Artifact(s)
+        if: matrix.artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ runner.os }}
+          path: ${{ matrix.artifact }}

.gitignore

@@ -49,3 +49,6 @@ Makefile*
 
 #MacOS stuff
 .DS_Store
+
+build/
+app/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "install/mac/createdmg"]
+	path = install/mac/createdmg
+	url = https://github.com/create-dmg/create-dmg.git

Application.pro

@@ -120,8 +120,9 @@ win32 {
     DEPLOY_INSTALLER = makensis /DPRODUCT_VERSION="$${PRODUCT_VERSION}" $$shell_quote($$system_path($${_PRO_FILE_PWD_}/install/win/install.nsi))
 }
 macx {
-    VERSION = $$system(echo $$GIT_VERSION | sed 's/[a-zA-Z]//')
+    QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
 
+    VERSION = $$system(echo $$GIT_VERSION | sed 's/[a-zA-Z]//')
 
     PLUGINS_SRC = $$system_path($${OUT_PWD}/app/stPlugin_*)
     PLUGINS_DST = $$system_path($${OUT_PWD}/app/StringTheory.app/Contents/MacOS/)
@@ -134,7 +135,7 @@ macx {
     DEPLOY_COMMAND = macdeployqt
     DEPLOY_CLEANUP = $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/StringTheory*.dmg
 
-    DEPLOY_INSTALLER = $${_PRO_FILE_PWD_}/install/mac/create-dmg --volname "StringTheory_Installer" --volicon "$${_PRO_FILE_PWD_}/res/icon.icns"
+    DEPLOY_INSTALLER = $${_PRO_FILE_PWD_}/install/mac/createdmg/create-dmg --volname "StringTheory_Installer" --volicon "$${_PRO_FILE_PWD_}/res/icon.icns"
     DEPLOY_INSTALLER += --background "$${_PRO_FILE_PWD_}/res/mac_install_bg.png" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon $${TARGET}$${TARGET_CUSTOM_EXT} 200 190 --hide-extension $${TARGET}$${TARGET_CUSTOM_EXT} --app-drop-link 600 185
     DEPLOY_INSTALLER += $${DEPLOY_DIR}/StringTheory_$${VERSION}.dmg $${OUT_PWD}/app/$${TARGET}$${TARGET_CUSTOM_EXT}
 }