From 0cce1727dfce2c0b6d7a6bb7b920cc5fa08cbcd2 Mon Sep 17 00:00:00 2001 From: Gregory Date: Sat, 1 Apr 2017 13:52:53 +0300 Subject: [PATCH] some changes --- Makefile | 6 +++--- src/output.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f40f5c2..9ed0011 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ FLAGS := $(CC_FLAGS) \ # compiler -CC = clang +CC = gcc # rules @@ -73,12 +73,12 @@ all: $(NAME) $(NAME): $(LIBFT_DIR)$(LIBFT) $(OBJ) @echo "$(CYAN)Linking binary...$(NORMAL)" - @$(CC) $(OBJ) $(FLAGS) -o $(NAME) + @$(CC) $(OBJ) $(DEBUG) $(FLAGS) -o $(NAME) @echo "$(GREEN)Done!$(NORMAL)" $(OBJ_DIR)%.o: $(SRC_DIR)%.c $(FT_LS_INC)$(FT_LS_HEADER) @echo "$(CYAN)Compiling object files: $(BLUE)$@$(NORMAL)" - @$(CC) $(CC_FLAGS) $(OPT) $(INC) -c $< -o $@ + @$(CC) $(CC_FLAGS) $(INC) -c $< -o $@ $(LIBFT_DIR)$(LIBFT): @echo "$(CYAN)Compiling libft library...$(NORMAL)" diff --git a/src/output.c b/src/output.c index 9cc6349..63dde15 100644 --- a/src/output.c +++ b/src/output.c @@ -73,7 +73,7 @@ void long_format(t_list *lst_d_elm, t_ft_ls *s_ls) void one_line(t_list *lst_d_elm, t_ft_ls *s_ls) { ft_putstr(((t_dir_elm *)lst_d_elm->content)->elm_name); - s_ls = 0; + s_ls = s_ls; if (lst_d_elm->next) ft_putstr(" "); else @@ -82,7 +82,7 @@ void one_line(t_list *lst_d_elm, t_ft_ls *s_ls) void one_column(t_list *lst_d_elm, t_ft_ls *s_ls) { - s_ls = 0; + s_ls = s_ls; ft_putstr(((t_dir_elm *)lst_d_elm->content)->elm_name); ft_putstr("\n"); }