Skip to content

Commit

Permalink
fixup for new cmake pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
vaxerski committed Oct 14, 2023
1 parent 2b306b3 commit 5af6aa7
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 28 deletions.
13 changes: 0 additions & 13 deletions pages/Contributing and Debugging/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,6 @@ With that, you can build in debug, go to the debugging tab and hit

attach and profile in your preferred way.

{{< hint >}}
For all ways, make sure to `sudo make clear` to clear any root-owned files.
Also, before the first build (or after some updates, possibly)
`sudo make config`. (If you get any `missing header file "...-protocol.h"`, you
need to `make config`.)
{{< /hint >}}

{{< hint type=warning >}}
`make config` will overwrite wlroots headers in `/usr/`,
meaning you'll be unable to build any other wlroots compositor
without a wlroots reinstall.
{{< /hint >}}

### Meson

```console
Expand Down
3 changes: 2 additions & 1 deletion pages/Crashes and Bugs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ sudo ninja -C build install

hyprland:
```
sudo make configdebug && make debug
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DWITH_ASAN:STRING=True -S . -B ./build -G Ninja
cmake --build ./build --config Debug --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
```

Exit Hyprland to a TTY, cd to the cloned hyprland, and launch it:
Expand Down
3 changes: 1 addition & 2 deletions pages/FAQ/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ updates after pressing a key) will cause rapid changes in brightness.
Open a terminal where you cloned the repo.
```bash
git pull
sudo make clear
sudo make install
make all && sudo make install
```

If you are using the AUR (hyprland-git) package, you
Expand Down
12 changes: 3 additions & 9 deletions pages/Getting Started/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ supports C++23 you have to pass `-stdlib=libstdc++` or switch to GCC.
```Plain
git clone --recursive https://github.com/hyprwm/Hyprland
cd Hyprland
sudo make install
make all && sudo make install
```

_CMake is always recommended as it's the intended way Hyprland should be installed._
Expand Down Expand Up @@ -226,15 +226,15 @@ cd into the hyprland repo.
for legacy renderer:

```plain
sudo make clear && sudo make config && make protocols && make legacyrenderer && sudo cp ./build/Hyprland /usr/bin && sudo cp ./example/hyprland.desktop /usr/share/wayland-sessions
make legacyrenderer && sudo cp ./build/Hyprland /usr/bin && sudo cp ./example/hyprland.desktop /usr/share/wayland-sessions
```

_please note the legacy renderer may not support some graphical features._
<br/><br/> Any other config: (replace \[PRESET\] with your preset, `release`
`debug` `legacyrenderer` `legacyrendererdebug`)

```plain
sudo make clear && sudo make config && make protocols && make [PRESET] && sudo cp ./build/Hyprland /usr/bin && sudo cp ./example/hyprland.desktop /usr/share/wayland-sessions
make [PRESET] && sudo cp ./build/Hyprland /usr/bin && sudo cp ./example/hyprland.desktop /usr/share/wayland-sessions
```

## Custom Build flags
Expand All @@ -252,12 +252,6 @@ How to?

Go to the root repo.

Clean before everything and config the root:

```plain
make clear && sudo make config && make protocols
```

Then, configure CMake:

```plain
Expand Down
4 changes: 2 additions & 2 deletions pages/Plugins/Development/Getting-Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ is required.
***→ If you don't have the Hyprland source cloned***

Clone the Hyprland source code to a subdirectory, in our example `MyPlugin/Hyprland`.
Run `cd Hyprland && sudo make pluginenv && cd ..`.
Run `cd Hyprland && make all && sudo make installheaders && cd ..`.

Now that you have the Hyprland sources set up, copy the contents of `example/examplePlugin/` to your working directory.

Expand Down Expand Up @@ -100,7 +100,7 @@ in the exit method. Hyprland will do that for you.
### Setting up a development environment
In order to make your life easier, it's a good idea to work on a nested debug Hyprland session.
Enter your Hyprland directory and run `sudo make config && make protocols && make debug`
Enter your Hyprland directory and run `make debug`
Make a copy of your config in `~/.config/hypr` called `hyprlandd.conf`.
Expand Down
3 changes: 2 additions & 1 deletion pages/Plugins/Using-Plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ git checkout tags/v0.24.1

Prepare Hyprland sources:
```sh
sudo make pluginenv
make all
sudo make installheaders
```

{{< hint type=note >}}
Expand Down

0 comments on commit 5af6aa7

Please sign in to comment.