Skip to content

Commit 2e1c595

Browse files
authored
Merge pull request #119 from Zen-cronic/update/vscode-build-steps
Update: Recommend Pixi for build
2 parents 418bcfc + d3d1170 commit 2e1c595

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

gettingstarted/VSCode.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ Cmake should automatically configure the project with the selected configuration
4141

4242
<video autoplay muted playsinline loop src="resources/build.mp4" type="video/mp4"></video>
4343

44-
Press `Ctrl + Shift + B`, or click the build button with the cog icon in the status bar, or run the `CMake: build` task.
44+
To build, either:
45+
46+
- Run [Pixi](./index.md#pixi) (**Recommended**), or
47+
- Press `Ctrl + Shift + B`, or
48+
- Click the build button with the cog icon in the status bar, or
49+
- Run the `CMake: build` task
4550

4651
**NOTE:** The first build takes a while.
4752

gettingstarted/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ why FreeCAD needs them.
1717

1818
## Supported versions
1919

20-
The head of the main branch of FreeCAD, currently used for the development of FreeCAD 1.1, can be compiled from source on systems as old as the
20+
The head of the main branch of FreeCAD, currently used for the development of FreeCAD 1.1, can be compiled from source on systems as old as the
2121
oldest currently-supported [Ubuntu LTS](https://packages.ubuntu.com/) at the time of its expected release, Ubuntu 22.04 LTS. This ties FreeCAD
2222
development to the C++20 standard, Python 3.10 and later, Qt 5.15, and the versions of the required libraries available on that system. We
2323
plan to update to requiring Ubuntu 24.04 LTS upon release of FreeCAD 1.1, with FreeCAD 1.2 only supporting compiling on that system and newer.

0 commit comments

Comments
 (0)