jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

escaped codes in makefile are now \e

Browse source
This commit is contained in:
Jack Halford 2017-02-07 20:16:53 +01:00
parent 87e5d1eed0
commit bb666ba0c6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
42sh/Makefile
View file

@ -6,7 +6,7 @@
# By: wescande <wescande@student.42.fr> +#+ +:+ +#+ # # By: wescande <wescande@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2016/08/29 21:32:58 by wescande #+# #+# # # Created: 2016/08/29 21:32:58 by wescande #+# #+# #
# Updated: 2017/02/07 16:11:13 by jhalford ### ########.fr # # Updated: 2017/02/07 20:11:22 by jhalford ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -230,7 +230,7 @@ $(NAME): $(LIBFT_LIB) $(OBJ_DIR) $(OBJS)
$(LIBS) \ $(LIBS) \
$(LIBFT_LIB) $(OBJS) \ $(LIBFT_LIB) $(OBJS) \
-o $(NAME) -o $(NAME)
@echo "\r\033[48;5;15;38;5;25m✅ MAKE $(NAME)\033[0m\033[K" @printf "\r\e[48;5;15;38;5;25m✅ MAKE $(NAME)\e[0m\e[K\n"
$(LIBFT_LIB): $(LIBFT_LIB):
@make -j -C $(LIBFT_DIR) @make -j -C $(LIBFT_DIR)
@ -244,7 +244,7 @@ $(OBJ_DIR)%.o : $(SRC_DIR)%.c | $(OBJ_DIR)
@$(eval PERCENT=$(shell echo $$(($(INDEX)*100/$(NB))))) @$(eval PERCENT=$(shell echo $$(($(INDEX)*100/$(NB)))))
@$(eval COLOR=$(shell echo $$(($(PERCENT)%35+196)))) @$(eval COLOR=$(shell echo $$(($(PERCENT)%35+196))))
@$(eval TO_DO=$(shell echo $$((20-$(INDEX)*20/$(NB))))) @$(eval TO_DO=$(shell echo $$((20-$(INDEX)*20/$(NB)))))
@printf "\r\033[38;5;11m⌛ MAKE %10.10s : %2d%% \033[48;5;%dm%*s\033[0m%*s\033[48;5;255m \033[0m \033[38;5;11m %*s\033[0m\033[K" $(NAME) $(PERCENT) $(COLOR) $(DONE) "" $(TO_DO) "" $(DELTA) "$@" @printf "\r\e[38;5;11m⌛ MAKE %10.10s : %2d%% \e[48;5;%dm%*s\e[0m%*s\e[48;5;255m \e[0m \e[38;5;11m %*s\e[0m\e[K" $(NAME) $(PERCENT) $(COLOR) $(DONE) "" $(TO_DO) "" $(DELTA) "$@"
@$(CC) $(FLAGS) -MMD -c $< -o $@\ @$(CC) $(FLAGS) -MMD -c $< -o $@\
-I $(INC_DIR)\ -I $(INC_DIR)\
-I $(LIBFT_INC) -I $(LIBFT_INC)
@ -252,14 +252,14 @@ $(OBJ_DIR)%.o : $(SRC_DIR)%.c | $(OBJ_DIR)
clean: cleanlib clean: cleanlib
@rm -rf $(OBJ_DIR) @rm -rf $(OBJ_DIR)
@echo "\r\033[38;5;202m✖ clean $(NAME).\033[0m\033[K" @echo "\r\e[38;5;202m✖ clean $(NAME).\e[0m\e[K\n"
cleanlib: cleanlib:
@make -C $(LIBFT_DIR) clean @make -C $(LIBFT_DIR) clean
fclean: clean fcleanlib fclean: clean fcleanlib
@rm -f $(NAME) @rm -f $(NAME)
@echo "\r\033[38;5;196m❌ fclean $(NAME).\033[0m\033[K" @printf "\r\e[38;5;196m❌ fclean $(NAME).\e[0m\e[K\n"
fcleanlib: cleanlib fcleanlib: cleanlib
@make -C $(LIBFT_DIR) fclean @make -C $(LIBFT_DIR) fclean

2
42sh/libft

@ -1 +1 @@
Subproject commit 6437a0545bf0eec54bc3ac4fa4bc24d83efcf384 Subproject commit d79c38104bbd45018d03a11d0c60cd6616e77ed8