diff --git a/.gitignore b/.gitignore index 33304b4..9ea383c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ *.pdf *.o *.a -fract-ol +cub3d LICENSE +mlx/build obj .git .ccls-cache diff --git a/Makefile b/Makefile index cf5fb11..8fccc1d 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,28 @@ # **************************************************************************** # # # -# .--. _ # +# :::::::: # # Makefile :+: :+: # -# |:_/ || |_ _ ___ __ # -# By: djonker // \ \ __| | | \ \/ / # -# (| | )|_| |_| |> < # -# Created: 2022/11/24 10:12:10 by djonker /'\_ _/`\__|\__,_/_/\_\ # -# Updated: 2023/10/26 10:43:49 by houtworm ######## odam.nl # +# +:+ # +# By: houtworm +#+ # +# +#+ # +# Created: 2023/10/26 10:46:29 by houtworm #+# #+# # +# Updated: 2023/10/26 10:56:42 by houtworm ######## odam.nl # # # # **************************************************************************** # NAME =cub3d CC =gcc -FC =-Wall -Werror -Wextra -Wunreachable-code -Ofast #-fsanitize=address +FC =-Wall -Werror -Wextra -Wunreachable-code -Ofast -g #-fsanitize=address HEAD =-I ./include -I $(MLX)/include RM =rm -rf -UNAME_S :=$(shell uname -s) LIB =libft/libft.a mlx/build/libmlx42.a -ldl -lglfw -pthread -lm SRC =src/main.c OBJ =$(SRC:src/%.c=obj/%.o) -all: libft libmlx $(NAME) +all: libft mlx/build/mlx42.a $(NAME) clean: - @$(RM) -r obj + @$(RM) obj @$(MAKE) -C libft clean > /dev/null @$(MAKE) -C mlx/build clean > /dev/null @printf "\e[1;35mCleaned Object Files\n\e[0;00m" @@ -48,7 +47,7 @@ $(NAME): $(OBJ) libft: @$(MAKE) -C libft all -libmlx: +mlx/build/mlx42.a: @cmake -S mlx -B mlx/build @$(MAKE) -C mlx/build -j4 diff --git a/cub3d b/cub3d index 45990e2..49cbff8 100755 Binary files a/cub3d and b/cub3d differ diff --git a/cub3d.h b/cub3d.h index cce0373..e19c24a 100644 --- a/cub3d.h +++ b/cub3d.h @@ -1,16 +1,15 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ +/* :::::::: */ /* cub3d.h :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: houtworm +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2022/11/29 03:25:46 by houtworm #+# #+# */ -/* Updated: 2023/10/26 10:37:13 by houtworm ######## odam.nl */ +/* +:+ */ +/* By: houtworm +#+ */ +/* +#+ */ +/* Created: 2023/10/26 10:46:35 by houtworm #+# #+# */ +/* Updated: 2023/10/26 10:47:00 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ - #ifndef CUB3D_H # define CUB3D_H diff --git a/src/main.c b/src/main.c index fdcfed1..ed42b70 100644 --- a/src/main.c +++ b/src/main.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ +/* :::::::: */ /* main.c :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: houtworm +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2022/12/13 08:03:00 by houtworm #+# #+# */ -/* Updated: 2023/10/26 10:44:41 by houtworm ######## odam.nl */ +/* +:+ */ +/* By: houtworm +#+ */ +/* +#+ */ +/* Created: 2023/10/26 10:46:22 by houtworm #+# #+# */ +/* Updated: 2023/10/26 10:46:24 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */