From 6d55ae40ed9fb64356db7351e724ef8900d952cc Mon Sep 17 00:00:00 2001 From: djonker Date: Thu, 26 Oct 2023 11:01:31 +0200 Subject: [PATCH] cleaned some stuff --- .gitignore | 3 ++- Makefile | 21 ++++++++++----------- cub3d | Bin 132456 -> 136136 bytes cub3d.h | 13 ++++++------- src/main.c | 12 ++++++------ 5 files changed, 24 insertions(+), 25 deletions(-) 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 45990e2ddf9f7636c2952211e589df80cd764ce0..49cbff8836b63bdebe67950d03bc42a9b71116af 100755 GIT binary patch delta 3611 zcmZ`+eQaA-6+icV+t2xM>?Tf{G)0>$8}@sd z{oG__uTa7@CF{5@?$QnnnSwsG7t%_rB*g ze{iLD&bhzyeXie!-}{nr?PcTQXwS8n1kpMQv(N@dVH9>>IWjM&hes}cXK{IE!(Jb~ z{<(MFPQUv5+Rh7`^3_e5={v>_p_}kEcz~yeMVuGIaDN#R!V~LPq@Ez50;s^aY3e)! z7}y)yB|;uCnHkTbEKB+;#1ws%n4#B+G3^V;RPvEVdiD?`sRs#~B4{jKMV3}n$Mr$| zB|&?-XORW6p-yAgZ3c#T9)ZLck*M8B`0&c-l~5v+m5euMxRPr@XZ6yqFBami3l zq0KbY$uxmYN~fk{I_%^{)x;*P455$9g80j*%0TQxWFGq=f;~S$(O~+v zu2UGhoig<#NQ8E$R)$RSQIw60f~Is#E zj}CMI)ITB9`;B%90*DU~COwa8iD!vlLcow-Y5`^uW0d3=HSvoGl_;h}5GN3)1Ajt( zbBi9#IdnZCx0CUITPpe~NJL!Vp%-JdoQ|I)nOyH#{J4p-RqxKmY`)6!H{_5-JLCb|2YW#bc z7ZuW3qz_3Aq$k)UV-K=P(5%po`uVxAV^g3V2w@uJn=N=u}u#hcVMfme}Kd>1j)S%c9CA3T30&U z&=G-7Lm9;TAKg1l+C+~jy4h*5O&VU3RL5{jw}bZWFf$$2A21QkF1{#XGlHFn$-_S& zXHq>#Q~7D=K}l~44>8oxAs`OPcSEzNTY6}*d5|)n&)^S0h4~adV1~goKW@r+lu8@O z?RVz1gX$gTd}`Ljr%X2?=0TGHtn^-Xo&_m}qTT^!&LGf0FGG0c;=(N!a6cX?CzDZp zf*t9Ng6Fi|y@z@!ig`P1?(UsW2|O{vYimm}x!p9w;GN{rF0$#OB&xCF7Q*wZ`1=g@ z@tPP~>xa31*T*oHk~f^MwB zz$#3d3)RrW%TmQ$2*~ikg=3?Tf<;i4V=uGpZCBJ9WO zPQ32N>nXgxj@Kq$5*w5{Virn_lkXCC1&RD)lCBZ?BNF9pBx*pf3r%GZlcF0y?qI5v zN~cmP)7n&Xm&$Ic<}sC>Br0hStE$FS^AQxUt0syB#WePY%9_upvbI-y2^}$Bbem={ z8Y0Q8DjoLGHi15IkQ8PdQdw|cR$|x`uONDc$wN%Lh;a=ot?E33k>Xjq$ZZi{vB>_0 zx$aY?OBY_fAn6#vaUK6`pKTF>RMbGu^HQ`XQtF~|Fom!!6^9YmzmaAUDhpOk6vz#>DhEsO!5_fNH zij_h=^lA77wHhtI5l+ zI&R5Zh5Vf7RpFjbEoASSI*^^3nV6oK%1%#C&rHrvPG!eye$%xNmu=UsJ4M_U>cz_8 zwb}jS`}bwXgK~EK*m42S%yGq_8c?@O^}?#C*s6Fn8%fh&_3Ab2c-?#4F8U3t=#>gJ z>n^WuTT=&$&83+VH0ni*1~O435v*pTZaHqT+AP`DlH)f7QgxQBa-$a>)Z#eLJEVoM6}pIosU6BTIqrINiY1f1+RUhb_O z{Vr+C;~)=s?Lv>Gq3~t8E%ELb%V-PVgP(|^K47BNdS@xns~t!GrzNGgPs3m&_1!&6aS6Y{lu;{=n}#8Fcg%(MumgidCF#*) z;zg!M_bYwL4_^IQj(zJbZ=z%`HOu)zz2KJZ283J3UG^fmu(VXS&qg~Oz8%R8zaEJM z=WpM8MY^+F0qbs=@2?gA6dlz8d`L! z8>e%uk89~Ojr+&{H6r}~!)|Hm%UWpP8x`7pLOVi{A0sVt{6g8X`u7Oi-*MaSjc+QF zkt_cn=WjK7QwFyO#o!NAMlz@We&ztP^4S!8|miTuWn6JpSCU0Vr-M&GWanbGVhd7zs*e7mana(53BqF#%5n^IO5yV`%>4w5g i`dl1SAi~BO)8iBwrKYzCGs$pS|A7dqGlB(KKso?S@g?j4 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 */ /* */ /* ************************************************************************** */