From b5a369da41012071a4346427ffd15366ea62f3ca Mon Sep 17 00:00:00 2001
From: Lukel495 <lukas.eliasson@live.se>
Date: Wed, 22 Nov 2023 15:30:42 +0100
Subject: [PATCH] fixar grejer

---
 .DS_Store  | Bin 6148 -> 8196 bytes
 .gitignore |   2 ++
 Makefile   |  10 +++++-----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index ad35bcfe459fdad037a040c45dd38a6fc8d1d498..6894944bcc5478129e737d9dc10ef7a52eb4ed88 100644
GIT binary patch
delta 320
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMA$iFdQH}hr%jz7$c**Q2SHn1@A
zPv&9S%Wh$*qhM@kvH1c^A!9N(LmERSLpnnSLkUAFLlJ`>Ljgk`L%L^9esWSyeiFz$
zpe;XvwBCO(0J1=Kr7`3K)s+C%mjGcJs(J=TpqhCw^^@(`Qk6M@W~VX~19g=GS;-(a
zsvgFlo2RfzGFl4&6_o-VQ2^CY40ImIs$#HJ6$~Y)+8EX&tlHeb)5pvu!3`8~1%<<A
bL5}atlletFC;Rhoa4<rGh+%U)&m3j|-ltG1

delta 120
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jH4hU^g=(_hcS{y^~)GyKUwd
zG-8~*TqtR?wJ;as#FD7R>>M0|%s?GLAixbITtS*Q7Jg@*%rD~!GKzr-Vl2oehRyLj
GbC>~Q;}wwr

diff --git a/.gitignore b/.gitignore
index ee1e260..5b75a22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ build
 
 # IDE-files
 .vscode
+Makefile
+.gitignore
diff --git a/Makefile b/Makefile
index bd5e408..6817806 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CC := g++
-CCFLAGS := -std=c++17 -Wall -Wextra -pedantic -Weffc++ -Wold-style-cast -I src
-LDFLAGS := -L${SFML_ROOT}/lib -I${SFML_ROOT}/include -lsfml-window -lsfml-graphics -lsfml-system
+CCFLAGS := -std=c++17 -Wall -Wextra -pedantic -Weffc++ -Wold-style-cast -Wno-narrowing -I src
+LDFLAGS := -L /opt/homebrew/Cellar/sfml/2.6.1/lib -I /opt/homebrew/Cellar/sfml/2.6.1/include -lsfml-window -lsfml-graphics -lsfml-system
 
 OBJDIR := build
 EXEDIR := build/exe
@@ -9,7 +9,7 @@ TEST := $(EXEDIR)/test.out
 
 SRC :=  $(shell find src -type f -name '[^_]*.cc')
 SRC_H :=  $(shell find src -type f -name '[^_]*.h')
-OBJECTS := $(addprefix $(OBJDIR)/, $(SRC:src/%.cc=%.o) ) 
+OBJECTS := $(addprefix $(OBJDIR)/, $(SRC:src/%.cc=%.o) )
 
 vpath %.cc  src
 
@@ -34,7 +34,7 @@ test-target: $(OBJDIR)/_test.o $(OBJECTS)
 	$(CC) $(LDFLAGS) $^ -o $(TEST) $(LDFLAGS)
 
 $(OBJDIR)/%.o: %.cc $(SRC_H)
-	$(CC) $(CCFLAGS) -c -o $@ $<
+	$(CC) $(CCFLAGS) $(LDFLAGS) -c -o $@ $<
 
 run:
 	./$(EXE)
@@ -43,4 +43,4 @@ test:
 	./$(TEST)
 
 clean:
-	rm -rf $(OBJDIR)/*
\ No newline at end of file
+	rm -rf $(OBJDIR)/*
-- 
2.30.2