diff --git a/.ccls b/.ccls deleted file mode 100644 index 839952d..0000000 --- a/.ccls +++ /dev/null @@ -1,3 +0,0 @@ -gcc -# Macros --DDEBUG=2 \ No newline at end of file diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..d22e7be --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,33 @@ +{ + "configurations": [ + { + "name": "Linux", + "intelliSenseMode": "linux-gcc-arm", + "includePath": [ + "${workspaceFolder}/src", + "${workspaceFolder}/src/components", + "${workspaceFolder}/core", + "${workspaceFolder}/core/host/generic", + "/usr/include/lua5.4", + "/usr/include/pipewire-0.3", + "/usr/include/spa-0.2", + "/usr/include/libdrm", + "/usr/include/libdecor-0", + "/usr/include/x86_64-linux-gnu" + ], + "compilerPath": "/usr/bin/gcc", + "defines": [ + "-D_REENTRANT" + ], + "cStandard": "c17", + "browse": { + "path": [ + "${workspaceFolder}" + ], + "limitSymbolsToIncludedHeaders": true, + "databaseFilename": "" + } + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index ee43b40..b8d2d84 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,14 +4,5 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ - { - "name": "Debug", - "type": "gdb", - "request": "launch", - "target": "${workspaceFolder}/build/linux/2D_Engine", - "cwd": "${workspaceFolder}/build/linux", - "valuesFormatting": "parseText", - "preLaunchTask": "Build" - } ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 3ab738a..f693bb1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,7 @@ { - "nixEnvSelector.suggestion": false, - "nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix", - "nixEnvSelector.useFlakes": false, - "files.associations": { "*.tsx": "xml", "*.map": "json", - "configure": "shellscript" + "configure": "shellscript", } } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 738683d..9674426 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -54,6 +54,25 @@ "clear": true } }, + { + "label": "Run", + "detail": "Build project and run", + "type": "shell", + "command": "make", + "args": [ + "-j$(nproc)", + "run" + ], + "group": "build", + "presentation": { + "echo": true, + "reveal": "always", + "focus": true, + "panel": "shared", + "showReuseMessage": true, + "clear": true + } + }, { "label": "Build Verbose", "detail": "Build project with verbosity on", @@ -72,6 +91,25 @@ "clear": true } }, + { + "label": "Build Debug", + "detail": "Build project in debug mode", + "type": "shell", + "command": "make", + "args": [ + "-j$(nproc)", + "DEBUG=2" + ], + "group": "build", + "presentation": { + "echo": true, + "reveal": "always", + "focus": true, + "panel": "shared", + "showReuseMessage": true, + "clear": true + } + }, { "label": "Run Debug", "detail": "Build project in debug mode and run", @@ -91,25 +129,6 @@ "showReuseMessage": true, "clear": true } - }, - { - "label": "Build Debug", - "detail": "Build project in debug mode", - "type": "shell", - "command": "make", - "args": [ - "-j$(nproc)", - "DEBUG=2" - ], - "group": "build", - "presentation": { - "echo": true, - "reveal": "always", - "focus": true, - "panel": "shared", - "showReuseMessage": true, - "clear": true - } } ] } \ No newline at end of file diff --git a/asset_builder/.ccls b/asset_builder/.ccls deleted file mode 100644 index bc24403..0000000 --- a/asset_builder/.ccls +++ /dev/null @@ -1,7 +0,0 @@ -gcc -# Headers --Iassets/asset_builder/src/headers --Isrc/components - -# Macros --DDEBUG=2 diff --git a/core/.ccls b/core/.ccls deleted file mode 100644 index 30de0d0..0000000 --- a/core/.ccls +++ /dev/null @@ -1,8 +0,0 @@ -gcc -# Headers --Icore --Icore/host/generic --Isrc/components - -# Macros --DASSET_FILE_NAME="$(make print-var-ASSET_OUTPUT)" diff --git a/core/host/linux/.ccls b/core/host/linux/.ccls deleted file mode 100644 index 537a5ae..0000000 --- a/core/host/linux/.ccls +++ /dev/null @@ -1,5 +0,0 @@ -gcc -# Headers --Icore --Icore/host/linux --Isrc/components diff --git a/src/.ccls b/src/.ccls deleted file mode 100644 index aa80df8..0000000 --- a/src/.ccls +++ /dev/null @@ -1,5 +0,0 @@ -gcc -# Headers --Isrc/components --Icore --Icore/host/generic