diff --git a/configuration/.vscode/c_cpp_properties.json b/configuration/.vscode/c_cpp_properties.json index 94fda69..7995528 100644 --- a/configuration/.vscode/c_cpp_properties.json +++ b/configuration/.vscode/c_cpp_properties.json @@ -16,7 +16,7 @@ "cStandard": "c17", "cppStandard": "c++20", "compilerPath": "C:\\TDT4102-mingw64\\bin\\clang", - "compileCommands": "${workspaceFolder}/builddir/compile_commands.json", + "compileCommands": "${workspaceFolder}/build/compile_commands.json", "intelliSenseMode": "windows-clang-x64" }, { @@ -32,7 +32,7 @@ ], "cStandard": "c17", "cppStandard": "c++20", - "compileCommands": "builddir/compile_commands.json", + "compileCommands": "build/compile_commands.json", "intelliSenseMode": "macos-clang-x64" }, { @@ -47,7 +47,7 @@ ], "cStandard": "c17", "cppStandard": "c++20", - "compileCommands": "builddir/compile_commands.json", + "compileCommands": "build/compile_commands.json", "intelliSenseMode": "linux-clang-x64" } ], diff --git a/configuration/.vscode/launch.json b/configuration/.vscode/launch.json index defc8d3..1dc73fa 100644 --- a/configuration/.vscode/launch.json +++ b/configuration/.vscode/launch.json @@ -4,7 +4,7 @@ "name": "Build and Run Debug", "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/builddir/program", + "program": "${workspaceFolder}/build/program", "args": [], "cwd": "${workspaceFolder}", "preLaunchTask": "Build Executable", diff --git a/configuration/.vscode/tasks.json b/configuration/.vscode/tasks.json index aac3879..b3c7619 100644 --- a/configuration/.vscode/tasks.json +++ b/configuration/.vscode/tasks.json @@ -5,7 +5,7 @@ "type": "shell", "label": "Build Executable", "command": "meson", - "args": ["compile", "-Cbuilddir"], + "args": ["compile", "-Cbuild"], "group": { "kind": "build", "isDefault": true diff --git a/dependencies/README.md b/dependencies/README.md index c7f5e3e..81a8ebb 100644 --- a/dependencies/README.md +++ b/dependencies/README.md @@ -4,7 +4,7 @@ This is the simple graphics library made for TDT4102. ## Commands -`meson setup builddir` - Set up builddir -`meson compile -C builddir` - Temporarily cd into builddir and compile -`meson install -C builddir --destdir ${env:AppData}/tdt4102/animationwindow` - Install files into folder in appdata. Is useful for testing +`meson setup build` - Set up a build-directory +`meson compile -C build` - Temporarily cd into the build-directory and compile +`meson install -C build --destdir ${env:AppData}/tdt4102/animationwindow` - Install files into folder in appdata. Is useful for testing Note that the `animationwindow.pc` generated is not relocateable. This will not be available as a feature until meson 0.63.0. Therefore we modify line 1 to be `prefix=${pcfiledir}/../..` manually.