42_adjoly/cub3d
Archived
1
0 Fork 0
Code Activity

「🔨」 fix(Libft): Modified a little libft for it to compile

Browse Source
This commit is contained in:
KeyZox committed 2024-10-19 12:14:12 +02:00
1 parent 4405cbca11
commit fa72a134a0
7 files changed
+15 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+3 -3
View File
@@ -6,7 +6,7 @@
# By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ # # By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/07 16:02:18 by adjoly #+# #+# # # Created: 2024/10/07 16:02:18 by adjoly #+# #+# #
# Updated: 2024/10/13 21:23:17 by adjoly ### ########.fr # # Updated: 2024/10/17 01:22:00 by adjoly ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@@ -32,7 +32,7 @@ SRCS = $(shell find src -name *.c)
OBJS = $(addprefix $(OBJSDIR), $(SRCS:.c=.o)) OBJS = $(addprefix $(OBJSDIR), $(SRCS:.c=.o))
FLAGS = -Wall -Werror -Wextra -g -lm -lSDL2 -MMD -MP FLAGS = -Wall -Werror -Wextra -g -MMD -MP
LIB = libft/libft.a \ LIB = libft/libft.a \
MacroLibX/libmlx.so MacroLibX/libmlx.so
@@ -42,7 +42,7 @@ $(NAME): $(OBJS)
@echo "✅ Libft compiled" @echo "✅ Libft compiled"
@#@make -sj -C $(MACRO_DIR) @#@make -sj -C $(MACRO_DIR)
@#@echo "✅ MacroLibX compiled" @#@echo "✅ MacroLibX compiled"
@$(CC) $(OBJS) $(LIB) -o $(NAME) $(FLAGS) @$(CC) $(OBJS) $(LIB) -o $(NAME) $(FLAGS) -lm -lSDL2
@echo "✅ Compiled" @echo "✅ Compiled"
$(OBJSDIR)%.o: %.c $(OBJSDIR)%.o: %.c
libft/Ft_Printf/ft_printf_utils.c
+3 -3
View File
@@ -6,7 +6,7 @@
/* By: madumerg <madumerg@student.42angouleme. +#+ +:+ +#+ */ /* By: madumerg <madumerg@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/26 15:52:39 by madumerg #+# #+# */ /* Created: 2023/11/26 15:52:39 by madumerg #+# #+# */
/* Updated: 2024/02/02 14:25:22 by madumerg ### ########.fr */ /* Updated: 2024/10/17 01:28:48 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,7 +14,7 @@
int ft_putchar(char c) int ft_putchar(char c)
{ {
write(1, &c, 1); (void)write(1, &c, 1);
return (1); return (1);
} }
@@ -56,7 +56,7 @@ int ft_putstr(char *str)
return (ft_putstr("(null)")); return (ft_putstr("(null)"));
while (str[i] != '\0') while (str[i] != '\0')
{ {
write(1, &str[i], 1); (void)write(1, &str[i], 1);
i++; i++;
} }
return (i); return (i);
libft/Makefile
+1 -1
View File
@@ -51,7 +51,7 @@ HEADERS = includes/
all : ${NAME} all : ${NAME}
${OBJS} : ${OBJS} :
@gcc -Wall -Wextra -Werror -I ${HEADERS} -c ${@:.o=.c} -o $@ @cc -Wall -Wextra -Werror -I ${HEADERS} -c ${@:.o=.c} -o $@
${NAME} : ${OBJS} ${NAME} : ${OBJS}
@ar rcs ${NAME} ${OBJS} @ar rcs ${NAME} ${OBJS}
libft/includes/libft.h
+1 -1
View File
@@ -6,7 +6,7 @@
/* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */ /* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/10/31 13:02:45 by madumerg #+# #+# */ /* Created: 2023/10/31 13:02:45 by madumerg #+# #+# */
/* Updated: 2024/09/04 16:24:48 by madumerg ### ########.fr */ /* Updated: 2024/10/16 20:58:23 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
libft/put/ft_putchar_fd.c
+2 -2
View File
@@ -6,7 +6,7 @@
/* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */ /* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/03 14:32:56 by madumerg #+# #+# */ /* Created: 2023/11/03 14:32:56 by madumerg #+# #+# */
/* Updated: 2023/11/03 14:52:19 by madumerg ### ########.fr */ /* Updated: 2024/10/17 01:13:30 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,5 +14,5 @@
void ft_putchar_fd(char c, int fd) void ft_putchar_fd(char c, int fd)
{ {
write(fd, &c, 1); (void)write(fd, &c, 1);
} }
libft/put/ft_putendl_fd.c
+3 -3
View File
@@ -6,7 +6,7 @@
/* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */ /* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/03 14:33:06 by madumerg #+# #+# */ /* Created: 2023/11/03 14:33:06 by madumerg #+# #+# */
/* Updated: 2024/04/04 17:11:24 by madumerg ### ########.fr */ /* Updated: 2024/10/17 01:28:14 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -21,8 +21,8 @@ void ft_putendl_fd(char *s, int fd)
return ; return ;
while (s[i] != '\0') while (s[i] != '\0')
{ {
write(fd, &s[i], 1); (void)write(fd, &s[i], 1);
i++; i++;
} }
write(fd, "\n", 1); (void)write(fd, "\n", 1);
} }
libft/put/ft_putstr_fd.c
+2 -11
View File
@@ -6,7 +6,7 @@
/* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */ /* By: madumerg <madumerg@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/03 14:33:15 by madumerg #+# #+# */ /* Created: 2023/11/03 14:33:15 by madumerg #+# #+# */
/* Updated: 2023/11/09 16:26:33 by madumerg ### ########.fr */ /* Updated: 2024/10/17 01:13:01 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,14 +14,5 @@
void ft_putstr_fd(char *s, int fd) void ft_putstr_fd(char *s, int fd)
{ {
int i; (void)write(fd, s, ft_strlen(s));
i = 0;
if (!s)
return ;
while (s[i] != '\0')
{
write(fd, &s[i], 1);
i++;
}
} }