Desktop builds

.github/workflows/ci.yaml

@@ -6,7 +6,6 @@ on:
   push:
     branches:
       - main
-      - build-in-ci
   pull_request: {}
 
 permissions:

.github/workflows/dev.yaml

@@ -0,0 +1,56 @@
+---
+name: Development/Desktop
+
+# yamllint disable-line rule:truthy
+on:
+  push:
+    branches:
+      - main
+  pull_request: {}
+
+permissions:
+  attestations: write
+  contents: read
+  id-token: write
+
+jobs:
+  build-macos:
+    runs-on: macos-latest
+    env:
+      PLATFORM: desktop
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.2.2
+
+      - name: Install dependencies
+        run: |
+          brew install make sdl2_image sdl2_ttf libzip libsamplerate
+          sudo ./workspace/desktop/macos_create_gcc_symlinks.sh
+
+      - name: Setup
+        run: make setup
+
+      - name: Build
+        run: make common PLATFORM=${{ env.PLATFORM }}
+
+  build-linux:
+    runs-on: ubuntu-24.04-arm
+    env:
+      PLATFORM: desktop
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.2.2
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libsdl2-image-dev libsdl2-ttf-dev 
+          sudo apt-get install -y libzip-dev liblzma-dev libzstd-dev libbz2-dev zlib1g-dev
+
+      - name: Setup
+        run: make setup
+
+      - name: Build
+        run: make common PLATFORM=${{ env.PLATFORM }}

.vscode/launch.json

@@ -5,15 +5,14 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "NextUI Launcher",
+            "name": "NextUI",
             "request": "launch",
             "type": "cppdbg",
             "osx": {
               "MIMode": "lldb"
             },
-            "cwd": "${workspaceFolder}/workspace/all/nextui/build/macos",
-            "program": "${workspaceFolder}/workspace/all/nextui/build/macos/nextui",
-            "preLaunchTask": "C/C++: gcc build macos",
+            "cwd": "${workspaceFolder}/workspace/all/nextui/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/nextui/build/desktop/nextui.elf",
             "environment": [{
               "name": "SHARED_USERDATA_PATH", 
               "value": "/Library/Developer/Projects/private/MinUI_FAKESD/.userdata/shared", 
@@ -26,9 +25,9 @@
             "osx": {
               "MIMode": "lldb"
             },
-            "cwd": "${workspaceFolder}/workspace/all/battery/build/macos",
-            "program": "${workspaceFolder}/workspace/all/battery/build/macos/battery",
-            "preLaunchTask": "C/C++: gcc build macos - Battery",
+            "cwd": "${workspaceFolder}/workspace/all/battery/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/battery/build/desktop/battery.elf",
+            "preLaunchTask": "make desktop",
         },
         {
             "name": "App: Input",
@@ -37,9 +36,9 @@
             "osx": {
               "MIMode": "lldb"
             },
-            "cwd": "${workspaceFolder}/workspace/all/minput/build/macos",
-            "program": "${workspaceFolder}/workspace/all/minput/build/macos/minput",
-            "preLaunchTask": "C/C++: gcc build macos - Minput",
+            "cwd": "${workspaceFolder}/workspace/all/minput/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/minput/build/desktop/minput.elf",
+            "preLaunchTask": "make desktop",
         },
         {
             "name": "App: Gametime",
@@ -48,9 +47,9 @@
             "osx": {
               "MIMode": "lldb"
             },
-            "cwd": "${workspaceFolder}/workspace/all/gametime/build/macos",
-            "program": "${workspaceFolder}/workspace/all/gametime/build/macos/gametime",
-            "preLaunchTask": "C/C++: gcc build macos - Gametime",
+            "cwd": "${workspaceFolder}/workspace/all/gametime/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/gametime/build/desktop/gametime.elf",
+            "preLaunchTask": "make desktop",
         },
         {
             "name": "App: Gametimectl",
@@ -59,10 +58,10 @@
             "osx": {
               "MIMode": "lldb"
             },
-            "cwd": "${workspaceFolder}/workspace/all/gametimectl/build/macos",
-            "program": "${workspaceFolder}/workspace/all/gametimectl/build/macos/gametimectl",
+            "cwd": "${workspaceFolder}/workspace/all/gametimectl/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/gametimectl/build/desktop/gametimectl.elf",
+            "preLaunchTask": "make desktop",
             "args": ["start", "foo.txt"],
-            "preLaunchTask": "C/C++: gcc build macos - Gametimectl",
         },
         {
             "name": "App: Settings",
@@ -71,13 +70,31 @@
             "osx": {
               "MIMode": "lldb"
             },
-            "cwd": "${workspaceFolder}/workspace/all/settings/build/macos",
-            "program": "${workspaceFolder}/workspace/all/settings/build/macos/settings",
-            "preLaunchTask": "C/C++: gcc build macos - Settings",
+            "cwd": "${workspaceFolder}/workspace/all/settings/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/settings/build/desktop/settings.elf",
+            "preLaunchTask": "make desktop",
             "environment": [{
               "name": "SHARED_USERDATA_PATH", 
               "value": "/Library/Developer/Projects/private/MinUI_FAKESD/.userdata/shared", 
             }]
-        }
+        },
+        {
+            "name": "Minarch",
+            "request": "launch",
+            "type": "cppdbg",
+            "osx": {
+              "MIMode": "lldb"
+            },
+            "cwd": "${workspaceFolder}/workspace/all/minarch/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/minarch/build/desktop/minarch.elf",
+            "environment": [{
+              "name": "SHARED_USERDATA_PATH", 
+              "value": "/Library/Developer/Projects/private/MinUI_FAKESD/.userdata/shared", 
+            }],
+            "args": [
+              "/Library/Developer/Projects/private/MinUI_ro8inmorgan/workspace/desktop/cores/output/gambatte_libretro.so", 
+              "/Library/Developer/Projects/private/MinUI_FAKESD/Roms/Game Boy Color (GBC)/Tetris DX (SGB Enhanced) (GB Compatible).zip"
+            ],
+        },
     ]
 }