Renamed minilibx to mlx

20 files changed, 16 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index eea9427..15d76b3 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ INCS_DIR	= inc/
 SRCS_DIR	= src/
 OBJS_DIR	= obj/
 LFT_DIR		= libft/
-MLX_DIR		= minilibx/
+MLX_DIR		= libmlx/
 #==============================================================================#
 #--------------------------------- Files --------------------------------------#
 #==============================================================================#
@@ -49,10 +49,11 @@ RM			= rm -rf
 #==============================================================================#
 ${OBJS_DIR}%.o:		${SRCS_DIR}%.c ${INCS_DIR}${INCS}
 	@${MKDIR} ${OBJS_DIR}
-	${CC} -c ${CFLAGS} -I${LFT_DIR}${INCS_DIR} -I${INCS_DIR} -o $@ $<
+	${CC} -c ${CFLAGS} -I${LFT_DIR}${INCS_DIR} -I${MLX_DIR} \
+-I${INCS_DIR} -o $@ $<
 #------------------------------------------------------------------------------#
 ${NAME}:	${OBJS}
-	${CC} ${CFLAGS} -o $@ $< -L${LFT_DIR} -lft
+	${CC} ${CFLAGS} -o $@ $< -L${LFT_DIR} -L${MLX_DIR} -lft -lmlx -lm 
 #------------------------------------------------------------------------------#
 all:
 	@$(MAKE) --no-print-directory -C ${MLX_DIR} all
@@ -72,6 +73,7 @@ fclean:		clean
 	@$(MAKE) --no-print-directory -C ${MLX_DIR} clean
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} fclean
 	${RM} ${NAME}
+	${RM} ${NAME}.dSYM
 #------------------------------------------------------------------------------#
 re:		fclean all
 #------------------------------------------------------------------------------#
diff --git a/minilibx/Makefile b/libmlx/Makefile
index 2e44836..2e44836 100644
--- a/minilibx/Makefile
+++ b/libmlx/Makefile
diff --git a/minilibx/font.c b/libmlx/font.c
index 656d248..656d248 100644
--- a/minilibx/font.c
+++ b/libmlx/font.c
diff --git a/minilibx/font.xcf b/libmlx/font.xcf
index b9c8c82..b9c8c82 100644
--- a/minilibx/font.xcf
+++ b/libmlx/font.xcf
diff --git a/minilibx/mlx.h b/libmlx/mlx.h
index e75b4af..e75b4af 100644
--- a/minilibx/mlx.h
+++ b/libmlx/mlx.h
diff --git a/minilibx/mlx_init_loop.m b/libmlx/mlx_init_loop.m
index 0377771..0377771 100644
--- a/minilibx/mlx_init_loop.m
+++ b/libmlx/mlx_init_loop.m
diff --git a/minilibx/mlx_int.h b/libmlx/mlx_int.h
index a93c1c9..a93c1c9 100644
--- a/minilibx/mlx_int.h
+++ b/libmlx/mlx_int.h
diff --git a/minilibx/mlx_int_str_to_wordtab.c b/libmlx/mlx_int_str_to_wordtab.c
index 3b2ef2e..3b2ef2e 100644
--- a/minilibx/mlx_int_str_to_wordtab.c
+++ b/libmlx/mlx_int_str_to_wordtab.c
diff --git a/minilibx/mlx_mouse.m b/libmlx/mlx_mouse.m
index 94ce0a9..94ce0a9 100644
--- a/minilibx/mlx_mouse.m
+++ b/libmlx/mlx_mouse.m
diff --git a/minilibx/mlx_new_image.m b/libmlx/mlx_new_image.m
index 46e1df1..46e1df1 100644
--- a/minilibx/mlx_new_image.m
+++ b/libmlx/mlx_new_image.m
diff --git a/minilibx/mlx_new_window.h b/libmlx/mlx_new_window.h
index d173e61..d173e61 100644
--- a/minilibx/mlx_new_window.h
+++ b/libmlx/mlx_new_window.h
diff --git a/minilibx/mlx_new_window.m b/libmlx/mlx_new_window.m
index 6d4fea4..6d4fea4 100644
--- a/minilibx/mlx_new_window.m
+++ b/libmlx/mlx_new_window.m
diff --git a/minilibx/mlx_opengl.h b/libmlx/mlx_opengl.h
index bb39267..bb39267 100644
--- a/minilibx/mlx_opengl.h
+++ b/libmlx/mlx_opengl.h
diff --git a/minilibx/mlx_opengl.m b/libmlx/mlx_opengl.m
index 554d79b..554d79b 100644
--- a/minilibx/mlx_opengl.m
+++ b/libmlx/mlx_opengl.m
diff --git a/minilibx/mlx_png.c b/libmlx/mlx_png.c
index ca8024d..ca8024d 100644
--- a/minilibx/mlx_png.c
+++ b/libmlx/mlx_png.c
diff --git a/minilibx/mlx_png.h b/libmlx/mlx_png.h
index 83ef145..83ef145 100644
--- a/minilibx/mlx_png.h
+++ b/libmlx/mlx_png.h
diff --git a/minilibx/mlx_rgb.c b/libmlx/mlx_rgb.c
index 3f98717..3f98717 100644
--- a/minilibx/mlx_rgb.c
+++ b/libmlx/mlx_rgb.c
diff --git a/minilibx/mlx_shaders.c b/libmlx/mlx_shaders.c
index 4a58955..4a58955 100644
--- a/minilibx/mlx_shaders.c
+++ b/libmlx/mlx_shaders.c
diff --git a/minilibx/mlx_xpm.c b/libmlx/mlx_xpm.c
index 78d8c9b..78d8c9b 100644
--- a/minilibx/mlx_xpm.c
+++ b/libmlx/mlx_xpm.c
diff --git a/src/main.c b/src/main.c
index 75a4559..84d7e23 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,15 @@
-#include <stddef.h>
-#include <string.h>
+#include <libft.h>
+#include <mlx.h>
+#include <stdlib.h>
 
 int main(void) {
-	strlen(NULL);
+	void *win;
+	void *winptr;
+
+	win = mlx_init();
+	winptr = (void*)malloc(800 * 600);
+	winptr = mlx_new_window(win, 800, 600, "Cub3d");
+	free(win);
+	free(winptr);
 	return (0);
 }