From a11b159e505a5a5f9715108c8806f8e176702608 Mon Sep 17 00:00:00 2001 From: adjoly Date: Wed, 11 Sep 2024 11:15:52 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20It=20wo?= =?UTF-8?q?rk=20on=20my=20machine=20also=20now=20:tada:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 8 +++----- cub3D | Bin 0 -> 17312 bytes {include => includes}/cub3d.h | 0 {include => includes}/mess_err.h | 0 src/{main.c => cub3d.c} | 6 +++--- src/parsing/check_arg.c | 4 ++-- src/utils/mess_error.c | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) create mode 100755 cub3D rename {include => includes}/cub3d.h (100%) rename {include => includes}/mess_err.h (100%) rename src/{main.c => cub3d.c} (88%) diff --git a/Makefile b/Makefile index c6c2120..e94768d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME = cub3D -CC = cc +CC = gcc OBJSDIR = obj/ @@ -12,9 +12,7 @@ LIBFT_DIR = libft/ INCLUDE = -I $(I_DIR) -I $(LIBFT_DIR)/$(I_DIR) -SRCS = src/main.c \ - src/parsing/check_arg.c \ - src/utils/mess_error.c +SRCS = $(shell find src -name '*.c') OBJS = $(addprefix $(OBJSDIR), $(SRCS:.c=.o)) @@ -22,7 +20,7 @@ FLAGS = -Wall -Werror -Wextra LIB = libft/libft.a $(NAME): $(OBJS) - @make -s -C libft + @make -sj $(nproc) -C libft @$(CC) $(FLAGS) $(OBJS) $(LIB) -o $(NAME) @echo "✅ Compiled" diff --git a/cub3D b/cub3D new file mode 100755 index 0000000000000000000000000000000000000000..dd839b8cd9a4f8c6cd8fd6197dfbdf375d6d8f80 GIT binary patch literal 17312 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 literal 0 HcmV?d00001 diff --git a/include/cub3d.h b/includes/cub3d.h similarity index 100% rename from include/cub3d.h rename to includes/cub3d.h diff --git a/include/mess_err.h b/includes/mess_err.h similarity index 100% rename from include/mess_err.h rename to includes/mess_err.h diff --git a/src/main.c b/src/cub3d.c similarity index 88% rename from src/main.c rename to src/cub3d.c index 816e15b..6c11405 100644 --- a/src/main.c +++ b/src/cub3d.c @@ -1,16 +1,16 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* main.c :+: :+: :+: */ +/* cub3d.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: madumerg +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/04 16:58:27 by madumerg #+# #+# */ -/* Updated: 2024/09/07 19:12:04 by madumerg ### ########.fr */ +/* Updated: 2024/09/11 11:10:39 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../include/cub3d.h" +#include "cub3d.h" char **ft_parse_map(char *map) { diff --git a/src/parsing/check_arg.c b/src/parsing/check_arg.c index f17f593..fcd69c3 100644 --- a/src/parsing/check_arg.c +++ b/src/parsing/check_arg.c @@ -6,11 +6,11 @@ /* By: madumerg +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/04 21:33:35 by madumerg #+# #+# */ -/* Updated: 2024/09/07 17:57:29 by madumerg ### ########.fr */ +/* Updated: 2024/09/11 11:11:05 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../include/cub3d.h" +#include "cub3d.h" int check_err_arg(int ac, char **av) { diff --git a/src/utils/mess_error.c b/src/utils/mess_error.c index 41446eb..c199dc9 100644 --- a/src/utils/mess_error.c +++ b/src/utils/mess_error.c @@ -6,11 +6,11 @@ /* By: madumerg +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/07 17:35:14 by madumerg #+# #+# */ -/* Updated: 2024/09/07 17:40:57 by madumerg ### ########.fr */ +/* Updated: 2024/09/11 11:10:48 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ -#include "../../include/cub3d.h" +#include "cub3d.h" int err_mess(char *str) {