diff --git a/projekt_linux/.vscode/launch.json b/projekt_linux/.vscode/launch.json index 1e926f0..bc7e5a2 100644 --- a/projekt_linux/.vscode/launch.json +++ b/projekt_linux/.vscode/launch.json @@ -5,16 +5,16 @@ "name": "(gdb) Launch", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/boat_sim.exe", + "program": "${workspaceFolder}/./boat_sim", "args": [], "stopAtEntry": true, "cwd": "${workspaceFolder}", "environment": [], "externalConsole": false, - "preLaunchTask": "Make", + "preLaunchTask": "Build", "windows": { "MIMode": "gdb", - "miDebuggerPath": "${workspaceFolder}/../mingw64/bin/gdb.exe", + "miDebuggerPath": "gdb", "setupCommands": [ { "description": "Enable pretty-printing for gdb", @@ -35,4 +35,5 @@ } } ] - } \ No newline at end of file + } + \ No newline at end of file diff --git a/projekt_linux/.vscode/tasks.json b/projekt_linux/.vscode/tasks.json index 49db2de..22b8ebf 100644 --- a/projekt_linux/.vscode/tasks.json +++ b/projekt_linux/.vscode/tasks.json @@ -2,9 +2,9 @@ "version": "2.0.0", "tasks": [ { - "label": "Make", + "label": "Build", "type": "shell", - "command": "${workspaceFolder}/../mingw64/bin/mingw32-make.exe", // Or "mingw32-make" if you are using MinGW on Windows and "make" is not in your PATH + "command": "make", // Or "mingw32-make" if you are using MinGW on Windows and "make" is not in your PATH "options": { "cwd": "${workspaceFolder}" }, @@ -17,24 +17,23 @@ } }, { - "label": "Clean Object Files (Windows)", + "label": "Clean (Linux)", "type": "shell", - "command": "${workspaceFolder}/../mingw64/bin/mingw32-make.exe clean", + "command": "make clean", "args": [ - "build/*.o" ], "problemMatcher": [], "group": "cleanup", - "detail": "Deletes all object files (*.o) in the current directory" + "detail": "Deletes all object files (*.o) in the build" }, { "label": "Run", "type": "shell", - "command": "${workspaceFolder}/../mingw64/bin/mingw32-make.exe run", + "command": "make run", "options": { "cwd": "${workspaceFolder}" }, - "dependsOn": "Make" + "dependsOn": "Build" } ] } \ No newline at end of file