Skip to content

renamed builddir to build #4

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configuration/.vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand All @@ -32,7 +32,7 @@
],
"cStandard": "c17",
"cppStandard": "c++20",
"compileCommands": "builddir/compile_commands.json",
"compileCommands": "build/compile_commands.json",
"intelliSenseMode": "macos-clang-x64"
},
{
Expand All @@ -47,7 +47,7 @@
],
"cStandard": "c17",
"cppStandard": "c++20",
"compileCommands": "builddir/compile_commands.json",
"compileCommands": "build/compile_commands.json",
"intelliSenseMode": "linux-clang-x64"
}
],
Expand Down
2 changes: 1 addition & 1 deletion configuration/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion configuration/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "shell",
"label": "Build Executable",
"command": "meson",
"args": ["compile", "-Cbuilddir"],
"args": ["compile", "-Cbuild"],
"group": {
"kind": "build",
"isDefault": true
Expand Down
6 changes: 3 additions & 3 deletions dependencies/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.