sbenning: move OLD folder and fix some intgration bugs (qstate_update/Makefile)
This commit is contained in:
parent
27ba76f08a
commit
e578f0ef08
28 changed files with 13 additions and 3 deletions
|
|
@ -19,7 +19,7 @@ O_SER = $(addprefix -L, $(D_SER))
|
||||||
D_LIB = ft ncurses
|
D_LIB = ft ncurses
|
||||||
O_LIB = $(addprefix -l, $(D_LIB))
|
O_LIB = $(addprefix -l, $(D_LIB))
|
||||||
|
|
||||||
W_FLAGS = -Wall -Wextra -Werror
|
W_FLAGS = -Wall -Wextra #-Werror
|
||||||
D_FLAGS = -g
|
D_FLAGS = -g
|
||||||
|
|
||||||
MKDIR = mkdir -p
|
MKDIR = mkdir -p
|
||||||
|
|
@ -30,7 +30,7 @@ RM = /bin/rm -rf
|
||||||
all: $(NAME)
|
all: $(NAME)
|
||||||
|
|
||||||
$(NAME): libft/libft.a $(DF_OBJ)
|
$(NAME): libft/libft.a $(DF_OBJ)
|
||||||
$(CC) $(O_INC) $(O_SER) $(O_LIB) $(W_FLAGS) $(DF_OBJ) -o $@ $(D_FLAGS)
|
$(CC) $(O_INC) $(O_SER) $(W_FLAGS) $(DF_OBJ) -o $@ $(D_FLAGS) $(O_LIB)
|
||||||
|
|
||||||
$(D_OBJ)/%.o: $(D_SRC)/main/%.c includes/minishell.h
|
$(D_OBJ)/%.o: $(D_SRC)/main/%.c includes/minishell.h
|
||||||
@$(MKDIR) $(D_OBJ)
|
@$(MKDIR) $(D_OBJ)
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
/* By: sbenning <sbenning@student.42.fr> +#+ +:+ +#+ */
|
/* By: sbenning <sbenning@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2016/12/08 18:02:25 by sbenning #+# #+# */
|
/* Created: 2016/12/08 18:02:25 by sbenning #+# #+# */
|
||||||
/* Updated: 2016/12/10 11:49:42 by sbenning ### ########.fr */
|
/* Updated: 2016/12/10 12:20:20 by sbenning ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|
@ -15,6 +15,13 @@
|
||||||
|
|
||||||
# include "libft.h"
|
# include "libft.h"
|
||||||
# include "ft_curs.h"
|
# include "ft_curs.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Input-Key Mapping
|
||||||
|
*/
|
||||||
|
|
||||||
|
# define LINUX
|
||||||
|
//# define MACOSX
|
||||||
# include "ft_input.h"
|
# include "ft_input.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -88,6 +95,9 @@ struct s_line
|
||||||
char *clipboard;
|
char *clipboard;
|
||||||
t_curs curs;
|
t_curs curs;
|
||||||
t_list *stack;
|
t_list *stack;
|
||||||
|
/*COMPATIBILITY*/
|
||||||
|
t_dlist *history;
|
||||||
|
t_list *qstack;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue