reorganize all files (only renamings)

This commit is contained in:
mcolonna 2024-10-31 16:06:33 +01:00
parent 609bd90b54
commit 878de1098b
27 changed files with 21 additions and 14 deletions

View file

@ -1,11 +1,11 @@
NAME = cub3d NAME = cub3d
CPP = gcc $(FLAGS) CPP = gcc
LIBRARIES_DIR = Libft Minilibx LIBRARIES_DIR = Libft Minilibx
LIBRARIES_A = Libft/libft.a Minilibx/libmlx.a LIBRARIES_A = Libft/libft.a Minilibx/libmlx.a
CPP_1 = $(CPP) -Wall -Wextra -Werror -I Libft -I Minilibx $(FLAGS_1) -g
CPP_2 = $(CPP) $(FLAGS_2)
SHARED = -lX11 -lXext -lm SHARED = -lX11 -lXext -lm
C_FILES = $(wildcard **.c) CPP_1 = $(CPP) -Wall -Wextra -Werror -I Libft -I Minilibx -I include $(FLAGS) $(FLAGS_1)
CPP_2 = $(CPP) $(FLAGS) $(FLAGS_2)
C_FILES = $(wildcard src/*.c)
O_FILES = $(patsubst %.c,%.o,$(C_FILES)) O_FILES = $(patsubst %.c,%.o,$(C_FILES))
ECHO = echoo(){ \ ECHO = echoo(){ \
@ -18,6 +18,12 @@ ECHO = echoo(){ \
all : $(NAME) all : $(NAME)
debug :
$(MAKE) all FLAGS_1="$(FLAGS_1) -g"
debugre :
$(MAKE) re FLAGS_1="$(FLAGS_1) -g"
$(LIBRARIES_DIR): $(LIBRARIES_DIR):
@$(ECHO) @$(ECHO)
@$(ECHO) "\e[30;47;1m $(NAME): making library $@... \e[0m" @$(ECHO) "\e[30;47;1m $(NAME): making library $@... \e[0m"
@ -32,8 +38,8 @@ fclean : clean
@$(ECHO) @$(ECHO)
@$(ECHO) "\e[30;47;1m $(NAME): fclean... \e[0m" @$(ECHO) "\e[30;47;1m $(NAME): fclean... \e[0m"
-rm -f $(NAME) -rm -f $(NAME)
$(MAKE) -C Libft fclean -$(MAKE) -C Libft fclean
$(MAKE) -C Minilibx clean -$(MAKE) -C Minilibx clean
-rm $$(find Minilibx -name "Makefile.gen") -rm $$(find Minilibx -name "Makefile.gen")
re : fclean all re : fclean all
@ -59,7 +65,7 @@ check_headers :
> __tmp_check_header.c echo "#include \"$$HEADER\""; \ > __tmp_check_header.c echo "#include \"$$HEADER\""; \
>> __tmp_check_header.c echo "#include \"$$HEADER\""; \ >> __tmp_check_header.c echo "#include \"$$HEADER\""; \
>> __tmp_check_header.c echo "int main(void) {}"; \ >> __tmp_check_header.c echo "int main(void) {}"; \
$(CPP) -o __tmp_check_header.out __tmp_check_header.c; \ $(CPP_1) -o __tmp_check_header.out __tmp_check_header.c; \
if [ $$? -ne 0 ]; \ if [ $$? -ne 0 ]; \
then \ then \
ERROR=1; \ ERROR=1; \

View file

View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* algo.h :+: :+: :+: */ /* algo.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: grobledo <grobledo@student.42.fr> +#+ +:+ +#+ */ /* By: mc <mc@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/30 15:45:59 by grobledo #+# #+# */ /* Created: 2024/09/30 15:45:59 by grobledo #+# #+# */
/* Updated: 2024/10/24 14:27:27 by grobledo ### ########.fr */ /* Updated: 2024/10/31 16:03:42 by mc ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,9 +17,10 @@
# include <math.h> # include <math.h>
# include <linux/types.h> # include <linux/types.h>
# include <stdbool.h> # include <stdbool.h>
# include "Minilibx/mlx.h" # include <stdlib.h>
# include "Minilibx/mlx_int.h" # include <X11/X.h>
# include "Libft/libft.h" # include "mlx.h"
# include "libft.h"
# include "stream.h" # include "stream.h"
# include "read_all_text.h" # include "read_all_text.h"

View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* map.h :+: :+: :+: */ /* map.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: mcolonna <mcolonna@student.42perpignan.fr +#+ +:+ +#+ */ /* By: mc <mc@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/01 13:59:04 by mcolonna #+# #+# */ /* Created: 2024/10/01 13:59:04 by mcolonna #+# #+# */
/* Updated: 2024/10/16 17:59:12 by mcolonna ### ########.fr */ /* Updated: 2024/10/31 15:57:58 by mc ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

View file

View file

View file

View file