From 540d9faee485406c075cd154bc9a0b8014e82672 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Tue, 16 Jul 2024 09:39:46 +0200 Subject: [PATCH] switch to clang++ and add bear to shell --- Makefile | 2 +- nix/shell.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7d39ca8..1d1946a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CXX = g++ +CXX = clang++ CXXFLAGS = -std=c++20 -O3 -Wall -Wextra -Wpedantic LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system diff --git a/nix/shell.nix b/nix/shell.nix index 4bee28a..c913cd6 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -1,19 +1,21 @@ { mkShell, - gcc, + clang, gnumake, clang-tools, sfml, + bear, ... }: mkShell { name = "osu++"; nativeBuildInputs = [ - gcc + clang gnumake # for clang-format clang-tools + bear ]; buildInputs = [