Revert "fixar grejer"

This reverts commit b5a369da41012071a4346427ffd15366ea62f3ca.

diff --git a/.DS_Store b/.DS_Store
index 6894944bcc5478129e737d9dc10ef7a52eb4ed88..ad35bcfe459fdad037a040c45dd38a6fc8d1d498 100644 (file)
Binary files a/.DS_Store and b/.DS_Store differ

diff --git a/.gitignore b/.gitignore
index 5b75a22bed221ac5607c71bb26605e662fcb0e6b..ee1e260f39c6c90460b6b32119a652847976f344 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,3 @@ build
 
 # IDE-files
 .vscode
-Makefile
-.gitignore

diff --git a/Makefile b/Makefile
index 6817806be0f02327efb163178514fbbeb20b5c77..bd5e4089bf2374fa9e5cb22f331376147031561c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CC := g++
-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
+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
 
 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) $(LDFLAGS) -c -o $@ $<
+       $(CC) $(CCFLAGS) -c -o $@ $<
 
 run:
        ./$(EXE)
@@ -43,4 +43,4 @@ test:
        ./$(TEST)
 
 clean:
-       rm -rf $(OBJDIR)/*
+       rm -rf $(OBJDIR)/*
\ No newline at end of file