Skip to content

Commit

Permalink
Merge pull request #8 from biralavor/3rd-mia-step
Browse files Browse the repository at this point in the history
adding 3rd mia step
  • Loading branch information
biralavor authored Jun 19, 2024
2 parents 0aee9c8 + dcda709 commit b4c330d
Show file tree
Hide file tree
Showing 18 changed files with 1,159 additions and 195 deletions.
16 changes: 8 additions & 8 deletions _ci_tdd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# By: umeneses <umeneses@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/05/10 10:09:44 by umeneses #+# #+# #
# Updated: 2024/06/04 16:33:23 by umeneses ### ########.fr #
# Updated: 2024/06/19 15:05:18 by umeneses ### ########.fr #
# #
# **************************************************************************** #

Expand Down Expand Up @@ -75,7 +75,7 @@ COMP_EXE = $(CC) $(LDFLAGS) $(OBJ_FILES) $(LDLIBS) -o $(NAME)
# **************************************************************************** #

define arguments
42 1 1024
42 1 10 21 11 7 4 2
endef

define bonus
Expand All @@ -96,13 +96,13 @@ $(BUILD_D)%.o: %.c
@$(COMP_OBJS)
@echo "Compiling: $(notdir $<)"

$(NAME): fclean push_swap $(OBJ_FILES)
$(NAME): clean push_swap $(OBJ_FILES)
@$(COMP_EXE)
@printf "$(PURPLE)"
@echo ">>> Running PUSH_SWAP with default arguments:"
@echo "$(call arguments)"
@printf "$(CYAN)"
$(PUSH_SWAP_D)./push_swap $(call arguments)
# @echo ">>> Running PUSH_SWAP with default arguments:"
# @echo "$(call arguments)"
# @printf "$(CYAN)"
# $(PUSH_SWAP_D)./push_swap $(call arguments)
@printf "$(GREEN)"
@echo "$(NAME) Ready!"
@printf "$(RESET)"
Expand All @@ -123,7 +123,6 @@ clean:
@printf "$(PURPLE)"
$(RM) $(OBJ_FILES)
$(RM) $(BUILD_D)
$(MAKE) -C $(PUSH_SWAP_D) fclean
@printf "$(RESET)"

fclean: clean
Expand All @@ -132,6 +131,7 @@ fclean: clean
@printf "$(PURPLE)"
$(RM) $(NAME)
$(RM) $(NAME_BONUS)
$(MAKE) -C $(PUSH_SWAP_D) fclean
@printf "$(RESET)"

re: fclean all
Expand Down
Loading

0 comments on commit b4c330d

Please sign in to comment.