d

Author: Allan BARRIELLE

42_map

@@ -0,0 +1,232 @@
+42
+Filit 2775 3000
+ft_printf 3200 3000
+Get_Next_line 3000 3000
+libft 2550 3000
+Piscine_Reloaded 2350 3000
+##end
+KFS_4 1850 1700
+KFS_3 1950 1800
+KFS_2 2050 1700
+roger_skyline_2 4100 2250
+Piscine_Swift_iOS 2100 3839
+Piscine_CPP 2400 4039
+Nm_otool 3000 1600
+Philosophers 3100 1750
+ft_script 2900 1750
+RT 3000 3900
+42sh 3000 2100
+21sh 3000 2300
+Matcha 2500 2500
+Piscine_OCaml 1872 3410
+Corewar 3900 3000
+Piscine_PHP 2600 2745
+Piscine_Ruby_on_Rails 1850 2750
+Docker 1600 2350
+Gomoku 4800 3000
+N_puzzle 4300 3150
+Taskmaster 3200 2200
+Expert_System 4300 2850
+mod1 3750 3250
+Fract'ol 3000 3475
+Scop 3000 4100
+Hypertube 2370 2370
+Camagru 2600 2600
+RTv1 3150 3680
+lem_in 3600 3000
+ft_select 2800 2450
+Push_swap 3400 3150
+Filer 3400 2850
+Wolf3d 2850 3680
+minishel 3000 2600
+ft_ls 3000 2800
+Process_and_Memory 2350 1500
+Famine 3000 1200
+RainFall 2450 1250
+ft_nmap 4100 1750
+Red_Tetris 2300 2100
+Piscine_Python_Django 1900 2550
+H42N42 1690 3280
+42run 2900 4250
+First_Internship 3000 3001
+Savoir_Relier 3550 3550
+FdF 3000 3300
+roger_skyline_1 3900 2250
+Corewar_Championship 3900 3150
+Friends_with_Benefits 2100 2300
+ft_p 3400 1500
+Rubik 4500 3250
+Part_time 4110 4110
+Root_me_|_Cracking 2550 1150
+Snow_Crash 2550 1350
+ft_turing 1550 3410
+Final_Internship 3000 3002
+GBmu 2550 1650
+Bomberman 2300 4600
+KFS_1 1950 1600
+ft_ping 3800 1750
+Music_Room 1900 4250
+XV 2575 4450
+Drivers_and_Interrupts 2200 1500
+Open_Project_I 3450 4050
+ft_linux 2650 1500
+Woody_Woodpacker 3200 1500
+libftASM 2800 1500
+Root_me_|_App_Systeme 2650 1250
+cloud_1 4050 2450
+In_the_Shadows 2725 4450
+ft_hangouts 2100 4200
+Dr_Quine 3000 1400
+Abstract_VM 2400 4350
+Filesystem 2050 1500
+strace 2700 1700
+IRC 3400 1700
+Darkly 2100 2100
+lem_ipc 3850 1450
+ComputorV1 4100 3250
+little_penguin_1 2500 1500
+Swifty_Proteins 1800 4039
+Swifty_Companion 2100 4039
+Nibbler 2200 4450
+KrpSim 4800 3250
+Open_Project_II 3518 4250
+Piscine_Unity 2650 4250
+Particle_System 3000 4400
+ft_linear_regression 4600 2800
+Malloc 3000 1900
+Matt_Daemon 3500 1300
+HumanGl 3100 4250
+Rushes 2650 3500
+C_Exam___Beginner 2350 3450
+Zappy 4300 1600
+ft_traceroute 3950 1750
+ft_ality 1690 3580
+##start
+42_Commandements 2150 3000
+42_Commandements-Piscine_Reloaded
+Piscine_Reloaded-libft
+libft-Filit
+Filit-Get_Next_line
+# Branche algo
+Get_Next_line-ft_printf
+ft_printf-Push_swap
+ft_printf-Filer
+Push_swap-lem_in
+Filer-lem_in
+lem_in-Corewar
+lem_in-mod1
+Corewar-First_Internship
+Corewar-Corewar_Championship
+#  Branche graph
+Get_Next_line-FdF
+FdF-Fract'ol
+Fract'ol-Wolf3d
+Fract'ol-RTv1
+RTv1-RT
+Wolf3d-RT
+RT-First_Internship
+# Branche sys
+Get_Next_line-ft_ls
+ft_ls-minishel
+minishel-ft_select
+minishel-21sh
+21sh-Taskmaster
+21sh-42sh
+42sh-First_Internship
+# Branche web
+Piscine_PHP-Camagru
+Camagru-Matcha
+Matcha-Hypertube
+Matcha-First_Internship
+# Branche web après stage
+First_Internship-Friends_with_Benefits
+First_Internship-Darkly
+First_Internship-Red_Tetris
+# Branche algo après stage
+First_Internship-ComputorV1
+First_Internship-N_puzzle
+First_Internship-Expert_System
+Expert_System-Gomoku
+Expert_System-ft_linear_regression
+Expert_System-KrpSim
+Expert_System-Rubik
+N_puzzle-Rubik
+N_puzzle-Gomoku
+N_puzzle-ft_linear_regression
+N_puzzle-KrpSim
+#Branche graph apres stage
+First_Internship-Scop
+Scop-42run
+Scop-HumanGl
+Scop-Particle_System
+#Branch sys apes stage
+First_Internship-Malloc
+Malloc-Philosophers
+Malloc-ft_script
+Malloc-Nm_otool
+#Branche sys : cote droit
+Nm_otool-ft_p
+Nm_otool-IRC
+IRC-Zappy
+Nm_otool-Zappy
+IRC-Matt_Daemon
+Nm_otool-Matt_Daemon
+IRC-lem_ipc
+Nm_otool-lem_ipc
+IRC-ft_ping
+Nm_otool-ft_ping
+ft_ping-ft_traceroute
+ft_traceroute-ft_nmap
+#Branche sys : côte gauche
+Nm_otool-libftASM
+libftASM-strace
+libftASM-GBmu
+libftASM-ft_linux
+ft_linux-little_penguin_1
+little_penguin_1-Process_and_Memory
+Process_and_Memory-Drivers_and_Interrupts
+Drivers_and_Interrupts-Filesystem
+Filesystem-KFS_1
+KFS_1-KFS_2
+KFS_2-KFS_3
+KFS_3-KFS_4
+libftASM-Snow_Crash
+Snow_Crash-RainFall
+libftASM-Root_me_|_App_Systeme
+Root_me_|_App_Systeme-Root_me_|_Cracking
+#Branche sys : en haut
+Famine-Woody_Woodpacker
+Woody_Woodpacker-Nm_otool
+Famine-libftASM
+First_Internship-Dr_Quine
+# les projets "pas reliés"
+First_Internship-Piscine_Python_Django
+First_Internship-Piscine_Ruby_on_Rails
+First_Internship-Docker
+First_Internship-Music_Room
+# Branche OCaml
+First_Internship-Piscine_OCaml
+Piscine_OCaml-H42N42
+Piscine_OCaml-ft_turing
+Piscine_OCaml-ft_ality
+# Branche CPP et consors
+First_Internship-Piscine_Swift_iOS
+First_Internship-Piscine_CPP
+Piscine_CPP-Piscine_Unity
+Swifty_Companion-Piscine_CPP
+Swifty_Companion-Piscine_Swift_iOS
+Swifty_Proteins-Swifty_Companion
+Piscine_CPP-ft_hangouts
+Abstract_VM-Piscine_CPP
+Nibbler-Abstract_VM
+Bomberman-Abstract_VM
+Piscine_Unity-In_the_Shadows
+In_the_Shadows-XV
+# Open projects
+Open_Project_I-First_Internship
+Open_Project_II-First_Internship
+# cloud
+First_Internship-cloud_1
+# réseau
+First_Internship-roger_skyline_1
+roger_skyline_1-roger_skyline_2

map/42_map 42_map_vmap/42_map renamed to 42_map_v

@@ -3,38 +3,40 @@
 #                                                         :::      ::::::::    #
 #    Makefile                                           :+:      :+:    :+:    #
 #                                                     +:+ +:+         +:+      #
-#    By: abarriel <marvin@42.fr>                    +#+  +:+       +#+         #
+#    By: abarriel <abarriel@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2017/02/19 11:33:06 by abarriel          #+#    #+#              #
-#    Updated: 2017/03/13 11:15:29 by abarriel         ###   ########.fr        #
+#    Updated: 2017/03/17 23:40:17 by abarriel         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-NAME	= lem_in
+NAME	= lem-in
 
 SRC		= lemin.c parser.c room.c tube.c algo.c print.c path.c tools.c send.c algo_.c
 
 OBJ		= $(addprefix srcs/,$(SRC:.c=.o))
 
 INCLUDES = ./includes/lemin.h
 
-LIBFT	= 	$(shell find ./libft | grep "\.c")
-CFLAGS	=  -Wall -Wextra -Werror -I./includes/ -Ilibft/includes/ 
+CFLAGS	=  -Wall -Wextra -I./includes/ -Ilibft/includes/
 
-$(NAME): $(OBJ) $(INCLUDES) $(LIBFT)
-	@make -C libft/
-	@gcc $(OBJ) -o $(NAME) -L libft/ -lft
-	@echo "Lem-in..."
+all: makefile libft $(NAME)
 
-all: $(NAME)
+libft:
+	@make -C libft
+
+$(NAME): $(OBJ) $(INCLUDES)
+	@gcc $(OBJ) -o $(NAME)  -Llibft -lft
+	@echo "$^"
 
 clean:
-	@make -C libft/ clean
+	@make clean -C libft
 	@rm -rf $(OBJ)
 
 fclean: clean
 	@rm -rf $(NAME) $(OBJ)
-	@make -C libft/ fclean
+	@make fclean -C libft
 
-re: fclean $(NAME)
+re: fclean all
 
+.PHONY: clean fclean re libft

Makefile

@@ -0,0 +1 @@
+Subproject commit 97f043a75395e9c8f60962353fc793b97ac57cc4

beta

@@ -14,12 +14,12 @@ INCLUDES += $(addprefix -iquote , $(INC_PATH))
 SRCS = $(shell find . | grep "\.c")
 OBJS = $(SRCS:.c=.o)
 
-all: $(NAME)
+all: makefile $(INCLUDES_FILES) $(NAME)
 
 header:
 	@echo "\033[1;36m[${NAME}]\033[1;32m Compile && Archive\033[0m"
 
-$(NAME): $(OBJS) $(INCLUDES_FILES)
+$(NAME): $(OBJS)
 	@printf "\n\r\e\033[0m\e[K\033[1;31m $@ \033[1;32m - Finished\033[0m\n"
 	@ar rc $(NAME) $(OBJS)
 %.o: %.c

e

@@ -1,15 +1,15 @@
 3
-##start
-1 23 3
+##end
+0 9 5
 2 16 7
-#commentaire
-3 16 3
 4 16 5
+3 16 3
+#commentaire
+7 4 8
 5 9 3
 6 1 5
-7 4 8
-##end
-0 9 5
+##start
+1 23 3
 0-4
 0-6
 1-3

libft/Makefile

@@ -1,11 +1,11 @@
 6
 ##start
 1 2 5
-4 5 6
+4 5 9
 2 5 6
 6 4 5
 7 4 9
-3 4 5
+3 44 5
 5 6 7
 ##end
 8 5 7

map/.DS_Store

@@ -1,10 +1,10 @@
 3
 2 5 0
-##start
-0 1 2
 ##end
 1 9 2
 3 5 4
+##start
+0 1 2
 0-2
 0-3
 2-1