From fe631bcff8ae405846c90d9bfe5d7006fea6c201 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 10 Mar 2026 17:32:53 -0500 Subject: [PATCH] chore: undo unintentional meson changes, update README --- Minecraft.Client/meson.build | 2 +- README.md | 5 +---- meson.build | 9 ++++----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build index f786de862..9f4fbaa1b 100644 --- a/Minecraft.Client/meson.build +++ b/Minecraft.Client/meson.build @@ -80,7 +80,7 @@ custom_target('copy_assets_to_client', command : [ python, meson.project_source_root() / 'scripts/copy_assets_to_client.py', meson.project_source_root(), - meson.build_root(), + meson.project_build_root(), meson.current_build_dir(), '@INPUT1@', '@OUTPUT@', diff --git a/README.md b/README.md index 672e052f4..6aa48b2c1 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,9 @@ sudo apt install \ #### Arch/Manjaro ```bash -sudo pacman -S base-devel gcc pkgconf cmake sdl2 mesa openal libvorbis glu +sudo pacman -S base-devel gcc pkgconf cmake sdl2-compat mesa openal libvorbis glu ``` -> [!TIP] -> SDL2 supports both X11 and Wayland backends; no package swap is necessary for Wayland!!!!!!! - #### Fedora/Red Hat/Nobara ```bash diff --git a/meson.build b/meson.build index fa5c4c35f..c1347746f 100644 --- a/meson.build +++ b/meson.build @@ -1,11 +1,10 @@ project('4jcraft-chucklegrounds', ['cpp', 'c'], version : '0.1.0', default_options : [ - 'warning_level=0', - 'buildtype=debug', - 'unity=on', # merge source files per target → fewer compile units - 'unity_size=8', # files per unity batch (tune up for faster full builds) - 'b_pch=true', # precompiled headers + 'buildtype=debug', # for now + 'unity=on', # merge source files per target + 'unity_size=8', # TODO: mess around with this + 'b_pch=true', # precompiled headers ], )