Make changes to Makefile and header

diff --git a/Makefile b/Makefile
index f220f29ac161a735645f05c539ca07315d3fa610..7d5e6c2ca3234ca6884f44065877b29492835cec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
 NAME   :=      so_long
 
 CC             =       cc
-CFLAGS =       -Wall -Wextra -Werror
-HEADERS        =       -Iinclude -Ilibft -Imlx
-LIBS   =       -Llibft -lft -lm -Lmlx -lmlx
-FRMWRKS        =       -framework OpenGL -framework AppKit
+CFLAGS =       -Wall -Wextra -Werror -Wunreachable-code -Ofast
+HEADERS        =       -Iinclude -Ilibft -IMLX42/include
+LIBS   =       -Llibft -lft -lm -LMLX42/build -lmlx42 -ldl -lglfw -pthread
 
 VPATH  :=      src
 SRC            =       main.c init.c loop.c input.c draw.c
@@ -15,8 +14,8 @@ OBJ           :=      $(addprefix $(OBJ_DIR)/, $(SRC:%.c=%.o))
 
 all: $(NAME)
 
-$(NAME): $(OBJ) | libft mlx
-       @$(CC) $(CFLAGS) $(HEADERS) $^ -o $@ $(LIBS) $(FRMWRKS)
+$(NAME): libmlx $(OBJ) | libft
+       @$(CC) $(CFLAGS) $(HEADERS) $^ -o $@ $(LIBS)
        @echo "[$(NAME)] Created binary."
 
 $(OBJ_DIR)/%.o: %.c
@@ -29,12 +28,18 @@ $(OBJ_DIR)/%.o: %.c
 libft:
        @make -C libft
 
-mlx:
-       @make -C mlx
+libmlx:
+       @if [ ! -d "MLX42" ]; then \
+               git clone https://github.com/codam-coding-college/MLX42.git; \
+       fi
+       @cmake MLX42 -B MLX42/build && make -C MLX42/build -j4
 
 clean:
        @make -C libft clean
-       @make -C mlx clean
+       @if [ -d "MLX42" ]; then \
+               rm -rf MLX42; \
+               echo "[$(NAME)] Removed MiniLibX."; \
+       fi
        @if [ -d "$(OBJ_DIR)" ]; then \
                rm -rf $(OBJ_DIR); \
                echo "[$(NAME)] Removed object files."; \
@@ -49,4 +54,4 @@ fclean: clean
 
 re:    fclean all
 
-.PHONY: all libft mlx clean fclean re
+.PHONY: all libft libmlx clean fclean re

diff --git a/include/so_long.h b/include/so_long.h
index bff31156ee08dc97a54d44eea35de75ff44a1efc..aea3bb8341895d0e30dcd79910684089ec78b853 100644 (file)
--- a/include/so_long.h
+++ b/include/so_long.h
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/08 14:14:02 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/05/09 19:24:00 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/05/10 10:55:30 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,7 +16,7 @@
 # define PLAYER_MOVE_SPEED 3
 
 # include "libft.h"
-# include "mlx.h"
+# include "../MLX42/include/MLX42/MLX42.h"
 
 enum                   e_direction
 {