From 858ab1dae7f3b87c06e910778b9af32f4e99d1bc Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Sat, 26 Oct 2024 00:10:01 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(Makefile/M?= =?UTF-8?q?egaphone):=20Fixed=20Makefile=20and=20useless=20newline=20in=20?= =?UTF-8?q?megaphone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ex00/Makefile | 16 ++++++++++++---- ex00/megaphone | Bin 16336 -> 0 bytes ex00/megaphone.cpp | 3 +-- 3 files changed, 13 insertions(+), 6 deletions(-) delete mode 100755 ex00/megaphone diff --git a/ex00/Makefile b/ex00/Makefile index d5b7b78..39e3b7e 100644 --- a/ex00/Makefile +++ b/ex00/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/25 16:09:27 by adjoly #+# #+# # -# Updated: 2024/10/25 17:48:45 by adjoly ### ########.fr # +# Updated: 2024/10/26 00:06:52 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -22,12 +22,19 @@ OBJS = $(addprefix $(OBJSDIR), $(SRCS:.cpp=.o)) FLAGS = -Wall -Werror -Wextra -std=c++98 +RED = \033[0;31m +GREEN = \033[0;32m +YELLOW = \033[1;33m +PURPLE = \e[0;35m +NC = \033[0m +DELETE = \x1B[2K\r + all: $(NAME) $(NAME): $(OBJS) - @printf "\x1B[1;33m[  ]\x1B[0m compiling $(NAME)..." + @printf "$(DELETE)$(GREEN)「🔨」 compiling $(NAME)...\n" @$(CC) $(FLAGS) $(OBJS) -o $(NAME) - @printf "\x1B[2K\r \x1B[1;33m[  ]\x1B[0m $(NAME) compiled.\n" + @printf "$(YELLOW)「✨」 $(NAME) compiled.\n" $(OBJSDIR)%.o: %.cpp @mkdir -p $(@D) @@ -35,11 +42,12 @@ $(OBJSDIR)%.o: %.cpp clean: @rm -f $(OBJS) + @printf "$(DELETE)$(RED)「🗑️」 ($(OBJS)) Object deleted\n" fclean: clean @rm -f $(NAME) @rm -Rf $(OBJSDIR) - @printf " \x1B[1;31m[  ]\x1B[0m deleted $(NAME).\n" + @printf "$(RED)「🗑️」 ($(NAME)) Program deleted\n" re: fclean all diff --git a/ex00/megaphone b/ex00/megaphone deleted file mode 100755 index b8b3558e2032f182a5dcb6a5359d9f7cfa437d45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16336 zcmeHOYit}>6~4Q666fi))3nZ`%@oq&B=Xv8JJv$;7(dpTrH<{|P8+Dg^>}w}uh?`EbF7(j&v(yvA7}2&-tpY~RHUcd@AC;3zt}I(nhEF%vd=;U!pbBpEY=HM zY!~;4m4H;jp{pF!c8c|7zn#Iliu@`-Bd-nq^)PLK_IL} zz_yXM0+VD5>L2SGYA0*0}{d0@M+4jfYldk+i$q?kdB`Ix=~4h$>iH?CPX*Z#s==Pw4neE+ZR z{^{w@to`;&Tn2K`2L=79No5hn@0)QH^MNI0t$_k((2*w)QGtBobf+$js zrL!4Xu*|$ArI26j9kjy9Y(b8gg+yyKleD@*kz;@lTB$;G&^YhLi!P>kgd98s_o!LX5{4;&pT#as1+#WYHWrJ$h7Dy#sfS_a+C9WqIO7z>9zv z0WShx1iT1%5%3~#dlC3c^*w(#PP|`boLX_UQ3&H3GnT(}$vE+gs##TFY0ujLm+pH9 z&ehv>NTEHBc~`HLK<;}BZJecFy`=0n(Z;FX)fr{~5^bE~T|Ec(VPooDI>0YM{BB)gU-CRq5=@# z(b-$-L;v?qF1A6%@5K9oi;+*Tu~Sc6H>QdUC!V-7=q%Qu#z6V1E1GxmBH%^9i+~paF9Kc!ya;#^@FL(vz>9zv zf&Zfj;CG>2T2J5MF0H+{OFP`#5osT2@92qW-H}LFM|uII!h` zT`fC4g)o+dbx(s|7=iW;fp7Xd*RL!wH2%bwB?-3 ze#K?;``S9f1(my=?8;hQr8bkz>zcQc9U#4h^krJdjPF$__zs3rX)AH2LRYDeZj`c^ zxJ)*`_svw=`Q^2RWUo;yAwD9l-qj#oNA@PttjcQ*;rlL%U!7rHDQSK`af_KTEnv;TW%URUm}v5l^GH|d8- zkCJx#AMEV>oK}B$q?oaaTBteL5^QP+6_pu!vbj0f)Vh;kK~AxhnHkfLCGv%2HiLOh z!B9i!vo@#2UB27Kaa<`rEV*&K9=Imj-|+Zp1l$MfkawMO+#;OsU)x)VlaRpnOw-BhH%Yx3;{lpPg4jgMH#o z;T~_b3WvLe?nm~o2RtA)3tVU6lyz|9Xn==Zcq91Nz#s3+;OEMIz-#gPQk=1$D4po< z-wf62%H~r)`uhWdpKpvmtjb|)Q5TedwOF9>z|X5w%lPBI4Q$U0`K$kRL2=(-#=jTx zYW?ukC4a7Y9{jQW?)Y3oe2Mk*YoK0?r#o(UDSV4KP2-Bo-$uB*{Cd@X_FB|EfNP6p zIrS*{54+kgVtFeR%)(lEb0jG(b4%2H^X74x$XNN~Vl;226Ea>*r;h{0VX1c9MMHjP!Ql?gR<@JY>Wm(C8Wvvg-@I?T4bB<^K0|cMnE}^5c0BWCf_g5ju( z&+~}KD{K#q9Z9?Sj{=Ur0o?vG)c!NXZzUeK5rx~&kKF@^?gA z1Pc=qIEP`rpm{P(PL#~pO4aLwG}q7b)g)k874v!CJwtq+XHzk^T)(eC2F`Jr&-24%Zu3%LL6$NEX&=XrV^y*L=;$n`Uy`~O|y zcaY!kN?oOfi9bv@@{!}_p9Ku#O74rl+thJ>KLQse6jnCH_aNouYxKLR5uf|d1cKG~ zGsJ%2;`2N;M~=^7;SOOwLoYzWSwGK%Dr;>Ie*a^Ccl&=#e2zcQ$Ao4xnwUu1&HowT zSU>Z5UnuVv-TN>2_WX8{pVM^3$Z0n5*S0F3`T8;NTS#nxgKoF-Jel{8y5q%s)_(wQ zwS&*|^2-eXg0P=$E!vE~2N^haxPG25^L}9WzF+2XyRHEjufxI}qC3)k3FaB87h#U!*@d_{%?W%&Cie3fN|TM{0VySKjkW%>t)}XW%z%^ NA2yIXT?CgY{sBx9qon`< diff --git a/ex00/megaphone.cpp b/ex00/megaphone.cpp index b2c552f..8b09957 100644 --- a/ex00/megaphone.cpp +++ b/ex00/megaphone.cpp @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/25 16:31:50 by adjoly #+# #+# */ -/* Updated: 2024/10/25 17:47:40 by adjoly ### ########.fr */ +/* Updated: 2024/10/25 23:25:48 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,7 +24,6 @@ void str_to_upper(std::string &str) } } - int main(int ac, char **av) { std::string str;