4210 [WinUAE dd1bb5b]

Author: FrodeSolheim

.vscode/launch.json

@@ -0,0 +1,38 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(gdb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/fs-uae",
+            "args": [
+                "--no-automatic-input-grab",
+                "--amiga-model=A1200/020",
+                "--graphics-card=uaegfx",
+                "--hard-drive-0=/home/frode/openretro/git/fs-uae-test/hd/uaegfx",
+                "--hard-drive-0-label=Workbench",
+                "--hard-drive-1=/home/frode/openretro/git/fs-uae-test/hd/work",
+                "--hard-drive-1-label=Work",
+                "--hard-drive-2=/home/frode/openretro/git/fs-uae-test/hd/files",
+                "--hard-drive-2-label=Files",
+                "--stdout",
+            ],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
+}

merge.commit

@@ -1 +1 @@
-3808bee0c8ba49ec16fb965b197ad1887be891f6
+dd1bb5bb902f69145afd6eaa68761b9326289644