From ad7240e54bd5b5a6b00bec57357d2cab60fc1952 Mon Sep 17 00:00:00 2001 From: InvisibleUp Date: Sat, 1 Apr 2023 18:17:50 -0700 Subject: [PATCH] Add VSCode debug configuration --- .gitignore | 3 ++- .vscode/launch.json | 20 ++++++++++++++++++++ .vscode/tasks.json | 23 +++++++++++++++++++++++ meson.build | 2 +- src/CFGMAN.h | 1 + 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.gitignore b/.gitignore index 51bf488..eae5fca 100644 --- a/.gitignore +++ b/.gitignore @@ -12,8 +12,9 @@ .vs/ # Visual Studio Code -.vscode/ .vscode/* +!.vscode/launch.json +!.vscode/tasks.json # KDevelop 4 *.kdev4 diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..8d5949d --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,20 @@ +{ + // 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": "(Windows) Launch", + "type": "cppvsdbg", + "request": "launch", + "program": "${workspaceFolder}/build/microvmac.exe", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}/build/", + "environment": [], + "console": "externalTerminal", + "preLaunchTask": "${defaultBuildTask}" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..fa3ac29 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,23 @@ +{ + "tasks": [ + { + "type": "cppbuild", + "label": "C/C++: compile with Meson", + "command": "meson", + "args": [ + "compile", + ], + "options": { + "cwd": "${workspaceFolder}/build" + }, + "problemMatcher": [ + "$msCompile" + ], + "group": { + "kind": "build", + "isDefault": true + }, + } + ], + "version": "2.0.0" +} \ No newline at end of file diff --git a/meson.build b/meson.build index 088c542..78b2037 100644 --- a/meson.build +++ b/meson.build @@ -187,6 +187,6 @@ executable( sources: MAC_SRC['Plus'] + UI_SRC + EMU_SRC + WIN_RSRC, dependencies: [lSDL2], include_directories: EMU_INC, - gui_app: true + #gui_app: true ) diff --git a/src/CFGMAN.h b/src/CFGMAN.h index bf6c3a7..c4d9959 100644 --- a/src/CFGMAN.h +++ b/src/CFGMAN.h @@ -7,6 +7,7 @@ /* Load or create config and prepare for use */ #pragma once +#include bool Config_TryInit();