unnötige flags aus Makefile genommen

Makefile

@@ -1,75 +1,75 @@
-# Author Yannis Gerlach
+# Author Yannis Gerlach
-# Hochschule Osnabrück
+# Hochschule Osnabrück
-# 29.04.2020
+# 29.04.2020
-
+
-# `make clean all` nicht mit -j verwenden! -> race condition im make file
+# `make clean all` nicht mit -j verwenden! -> race condition im make file
-# statdessen: `make clean; make all -j` verwenden
+# statdessen: `make clean; make all -j` verwenden
-
+
-NAME = %NAME%
+NAME = %NAME%
-NAMETEST = test
+NAMETEST = test
-CFLAGS = -std=c++17 -O2 -g -pipe -Wall -Wextra -Wno-unused-parameter -Wpedantic -rdynamic -msse2 -mavx2 #-march=native -Wall
+CFLAGS = -std=c++17 -O2 -g -pipe -Wall -Wextra -Wno-unused-parameter -Wpedantic -rdynamic #-march=native -Wall
-CXX = g++
+CXX = g++
-SRCF = src/
+SRCF = src/
-BUILDDIR = build/
+BUILDDIR = build/
-TESTF = tests/
+TESTF = tests/
-DEPF = $(BUILDDIR)deps/
+DEPF = $(BUILDDIR)deps/
-
+
-LOGF = ./Log/
+LOGF = ./Log/
-LOGO = $(LOGF)Log.o
+LOGO = $(LOGF)Log.o
-
+
-INCLUDES = -I$(LOGF) -Iminiaudio/
+INCLUDES = -I$(LOGF) -Iminiaudio
-LDFLAGS = -lGL -lglfw -lfreeimage -lGLEW -lassimp -lpthread -lm -ldl
+LDFLAGS = 
-
+
-SRCFILES = $(shell find $(SRCF) -name "*.cpp")
+SRCFILES = $(shell find $(SRCF) -name "*.cpp")
-OBJFILES = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(patsubst %.cpp, %.o, $(SRCFILES))) $(LOGO)
+OBJFILES = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(patsubst %.cpp, %.o, $(SRCFILES))) $(LOGO)
-DEPFILES = $(wildcard $(DEPF)*.d)
+DEPFILES = $(wildcard $(DEPF)*.d)
-
+
-SOURCEDIRS = $(shell find $(SRCF) -type d -printf "%p/\n")
+SOURCEDIRS = $(shell find $(SRCF) -type d -printf "%p/\n")
-BUILDDIRS = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(SOURCEDIRS))
+BUILDDIRS = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(SOURCEDIRS))
-
+
-OBJFILESTEST = $(filter-out $(BUILDDIR)main.o, $(OBJFILES))
+OBJFILESTEST = $(filter-out $(BUILDDIR)main.o, $(OBJFILES))
-
+
-INCLUDES += $(addprefix -I, $(SOURCEDIRS))
+INCLUDES += $(addprefix -I, $(SOURCEDIRS))
-
+
-all: $(NAME) runtest
+all: $(NAME) runtest
-
+
-$(NAME): $(BUILDDIRS) $(DEPF) $(OBJFILES)
+$(NAME): $(BUILDDIRS) $(DEPF) $(OBJFILES)
-	@echo "Linking $@"
+	@echo "Linking $@"
-	@$(CXX) $(CFLAGS) -o $@ $(filter %.o, $^) $(LDFLAGS)
+	@$(CXX) $(CFLAGS) -o $@ $(filter %.o, $^) $(LDFLAGS)
-
+
-$(BUILDDIR)%.o: $(SRCF)%.cpp
+$(BUILDDIR)%.o: $(SRCF)%.cpp
-	@echo "Compiling: $@"
+	@echo "Compiling: $@"
-	@$(CXX) $(CFLAGS) $(INCLUDES) $< -MM -MT $@ > $(DEPF)$(subst /,_,$*).d
+	@$(CXX) $(CFLAGS) $(INCLUDES) $< -MM -MT $@ > $(DEPF)$(subst /,_,$*).d
-	@$(CXX) -c -o $@ $(CFLAGS) $(INCLUDES) $<
+	@$(CXX) -c -o $@ $(CFLAGS) $(INCLUDES) $<
-
+
-$(NAME)_strip: $(NAME)
+$(NAME)_strip: $(NAME)
-	@echo "Strip $<"
+	@echo "Strip $<"
-	@strip -o $@ $<
+	@strip -o $@ $<
-
+
-%/:
+%/:
-	mkdir -p $@
+	mkdir -p $@
-
+
-clean-depends:
+clean-depends:
-	$(RM) -r $(DEPF)
+	$(RM) -r $(DEPF)
-
+
-$(LOGO):
+$(LOGO):
-	$(MAKE) -C $(LOGF) all
+	$(MAKE) -C $(LOGF) all
-
+
-clean:
+clean:
-	$(RM) -r $(NAME) $(BUILDDIR) $(NAMETEST) $(NAME)_strip shader/debug/
+	$(RM) -r $(NAME) $(BUILDDIR) $(NAMETEST) $(NAME)_strip shader/debug/
-	$(MAKE) -C $(LOGF) $@
+	$(MAKE) -C $(LOGF) $@
-
+
-$(NAMETEST): $(BUILDDIRS) $(DEPF) $(TESTF)*.cpp $(OBJFILESTEST)
+$(NAMETEST): $(BUILDDIRS) $(DEPF) $(TESTF)*.cpp $(OBJFILESTEST)
-	@echo "Compiling tests"
+	@echo "Compiling tests"
-	@$(CXX) -o $@ $(filter %.o, $^) $(filter %.cpp, $^) $(CFLAGS) -I$(SRCF) $(INCLUDES) $(LDFLAGS)
+	@$(CXX) -o $@ $(filter %.o, $^) $(filter %.cpp, $^) $(CFLAGS) -I$(SRCF) $(INCLUDES) $(LDFLAGS)
-
+
-runtest: $(NAMETEST)
+runtest: $(NAMETEST)
-	@echo "Running tests"
+	@echo "Running tests"
-	./$<
+	./$<
-
+
-# fix assets :
+# fix assets :
-# find assets/ -name '*.*' -exec sh -c 'a=$(echo "$0" | sed -r "s/([^.]*)\$/\L\1/"); [ "$a" != "$0" ] && mv "$0" "$a" ' {} \;
+# find assets/ -name '*.*' -exec sh -c 'a=$(echo "$0" | sed -r "s/([^.]*)\$/\L\1/"); [ "$a" != "$0" ] && mv "$0" "$a" ' {} \;
-
+
-.PHONY: clean all $(NAMETEST) clean-depends runtest
+.PHONY: clean all $(NAMETEST) clean-depends runtest
-
+
-include $(DEPFILES)
+include $(DEPFILES)