+ | Basic shader

Makefile

@@ -5,72 +5,119 @@
 #                                                     +:+ +:+         +:+      #
 #    By: ycontre <ycontre@student.42.fr>            +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
-#    Created: 2024/09/27 14:52:58 by TheRed            #+#    #+#              #
-#    Updated: 2024/10/13 20:04:05 by ycontre          ###   ########.fr        #
+#    Created: 2024/10/13 19:39:57 by ycontre           #+#    #+#              #
+#    Updated: 2024/10/14 19:31:54 by ycontre          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-BLACK		=	
-RED			=	
-GREEN		=	
-YELLOW		=	
-BLUE		=	
-MAGENTA		=	
-CYAN		=	
-WHITE		=	
+BLACK		=	\033[30;49;3m
+RED			=	\033[31;49;3m
+GREEN		=	\033[32;49;3m
+YELLOW		=	\033[33;49;3m
+BLUE		=	\033[34;49;3m
+MAGENTA		=	\033[35;49;3m
+CYAN		=	\033[36;49;3m
+WHITE		=	\033[37;49;3m
 
-RESET		=	
+BBLACK		=	\033[30;49;3;1m
+BRED		=	\033[31;49;3;1m
+BGREEN		=	\033[32;49;3;1m
+BYELLOW		=	\033[33;49;3;1m
+BBLUE		=	\033[34;49;3;1m
+BMAGENTA	=	\033[35;49;3;1m
+BCYAN		=	\033[36;49;3;1m
+BWHITE		=	\033[37;49;3;1m
+
+RESET		=	\033[0m
 
 LINE_CLR	=	\33[2K\r
 
+FILE		=	$(shell ls -lR srcs/ | grep -F .c | wc -l)
+CMP			=	1
+
 NAME        :=	RT
 
 SRCS_DIR	:=	srcs
 
 OBJS_DIR	:=	.objs
 
-ALL_SRCS	:=	RT.cpp	gl.cpp			\
-				Window.cpp Shader.cpp	\
+ASSETS_DIR	:=	assets
 
+SRC_ASSETS_DIR := assets_src 
+
+ALL_SRCS	:=	RT.cpp gl.cpp			\
+				Window.cpp Shader.cpp	\
 				
 SRCS		:=	$(ALL_SRCS:%=$(SRCS_DIR)/%)
 
 
 OBJS		:=	$(addprefix $(OBJS_DIR)/, $(SRCS:%.cpp=%.o))
 
-CC          :=	g++ -Wextra -Wall -Werror
+HEADERS		:=	includes/RT.hpp
 
-IFLAGS	    :=	-Ofast -I./includes -L./lib -lglfw3 -lopengl32 -lgdi32 -lcglm
+CC          :=	clang -Wextra -Werror -Wall
 
-RM          :=	del /f /s /q
+CFLAGS      :=	-Ofast
+
+LDFLAGS		:= -lglfw -lstdc++
+
+IFLAGS	    :=	-I ./includes
+
+
+RM          :=	rm -rf
 
 MAKEFLAGS   += --no-print-directory
 
-DIR_DUP     =	if not exist "$(@D)" mkdir "$(@D)"
+DIR_DUP     =	mkdir -p $(@D)
 
 # RULES ********************************************************************** #
 
 all: $(NAME)
 
-$(NAME): $(OBJS) $(HEADERS)
-	@$(CC) -o $(NAME) $(OBJS) $(IFLAGS)
-	@echo $(WHITE) $(NAME): PROJECT COMPILED !$(RESET) & echo:
+bonus: all
+
+$(NAME): $(OBJS) $(HEADERS) $(ASSETS)
+	@$(CC) $(LDFLAGS) $(CFLAGS) $(IFLAGS) $(OBJS) -o $(NAME)
+	@printf "$(LINE_CLR)$(BWHITE) $(NAME): PROJECT COMPILED !$(RESET)\n\n"
 
 $(OBJS_DIR)/%.o: %.cpp
 	@$(DIR_DUP)
-	@echo $(WHITE) $(NAME): $(WHITE)$<$(RESET) $(GREEN)compiling...$(RESET)
-	@$(CC) -c $^ $(IFLAGS) -o $@ 
+	@if [ $(CMP) -eq '1' ]; then \
+		printf "\n"; \
+	fi;
+	@printf "$(LINE_CLR)$(WHITE) $(NAME): $(CMP)/$(FILE) $(BWHITE)$<$(RESET) $(GREEN)compiling...$(RESET)"
+	@$(CC) $(CFLAGS) $(IFLAGS) -o $@ -c $^
+	@$(eval CMP=$(shell echo $$(($(CMP)+1))))
+	@if [ $(CMP) -gt $(FILE) ]; then \
+		printf "$(LINE_CLR)$(WHITE) $(NAME): $$(($(CMP)-1))/$(FILE)\n$(LINE_CLR)$(BGREEN) Compilation done !$(RESET)\n"; \
+	fi \
 
 
-fclean:
-	@echo  $(WHITE)$(NAME):$(RED) cleaned.$(RESET)
-	@del /f /s /q $(NAME).exe
-	@rmdir /S /Q "$(OBJS_DIR)"
+clean:
+	@$(RM) $(OBJS)
+
+dclean: clean
+	@$(RM) $(OBJS_DIR)
+
+fclean: dclean
+	@make --quiet clean -C ${MINILIB_DIR}
+	@printf " $(BWHITE)$(NAME):$(BRED) cleaned.$(RESET)\n"
+	@$(RM) $(NAME)
+	@make -C $(LFT_DIR) fclean
+	@killall convert 2>/dev/null > /dev/null|| true && \
+	sleep 0.5 && rm -rf $(ASSETS_DIR)&
+
+mfclean: dclean
+	@$(RM) $(NAME)
+
+mre:
+	@make mfclean
+	@make all
 
 re:
-	@$(MAKE) fclean
-	@$(MAKE) all
+	@make fclean
+	@make all
 
 # **************************************************************************** #
 
-.PHONY: all clean fclean dclean re bonus
+.PHONY: all clean fclean dclean re bonus