Makefile update, better directory tree

19 files changed, 24 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index e7b037a..3db5516 100644
--- a/Makefile
+++ b/Makefile
@@ -132,19 +132,16 @@ else
 	${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -lft -lX11 -lXext -lmlx -lm -lbsd
 endif
 #--------------------------------------------------------------------------------------------------#
-lft:
+all:
+ifeq (${OS}, Darwin)
+	@$(MAKE) --no-print-directory -C ${MLX_DIR} all
+endif
 ifdef ASAN
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} all ASAN=1
 else
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} all
 endif
-#--------------------------------------------------------------------------------------------------#
-mlx:
-ifeq (${OS}, Darwin)
-	@$(MAKE) --no-print-directory -C ${MLX_DIR} all
-endif
-#--------------------------------------------------------------------------------------------------#
-all: mlx lft ${NAME}
+	@$(MAKE) ${NAME}
 #--------------------------------------------------------------------------------------------------#
 clean: 
 ifeq (${OS}, Darwin)
@@ -153,14 +150,14 @@ endif
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} clean
 	${RM} ${OBJS_DIR}
 #--------------------------------------------------------------------------------------------------#
-fclean:		clean
+fclean: clean
 	@$(MAKE) --no-print-directory -C ${LFT_DIR} fclean
 	${RM} ${NAME}
 	${RM} ${NAME}.dSYM
 #--------------------------------------------------------------------------------------------------#
-re:		fclean all
+re: fclean all
 #--------------------------------------------------------------------------------------------------#
-run:	all
+run: all
 	@./${NAME} "map/map_one.cub"
 #--------------------------------------------------------------------------------------------------#
 .PHONY:	all clean clean fclean re run default
diff --git a/map/map_one.cub b/map/map_one.cub
index 168e1e8..9269e32 100644
--- a/map/map_one.cub
+++ b/map/map_one.cub
@@ -1,10 +1,10 @@
-R 1000 720
+R 1400 900
 
-NO ./map/img/BRIQUASSES.xpm
-SO ./map/img/BRIQUASSE_3.xpm
-EA ./map/img/BRIQUASSES_2.xpm
-WE ./map/img/MURLOL.xpm
-S ./map/img/segfot.xpm
+NO ./media/img/BRIQUASSES.xpm
+SO ./media/img/BRIQUASSE_3.xpm
+EA ./media/img/BRIQUASSES_2.xpm
+WE ./media/img/MURLOL.xpm
+S ./media/img/segfot.xpm
 
 C 50,100,200
 F 50,190,124
diff --git a/map/map_three.cub b/map/map_three.cub
index c60779a..c2e6edf 100644
--- a/map/map_three.cub
+++ b/map/map_three.cub
@@ -1,10 +1,10 @@
 R 1000 720
 
-NO ./map/img/BRIQUASSES.xpm
-SO ./map/img/BRIQUASSES.xpm
-EA ./map/img/hey.xpm
-WE ./map/img/left_arrow.xpm
-S ./map/img/segfot.xpm
+NO ./media/img/BRIQUASSES.xpm
+SO ./media/img/BRIQUASSES.xpm
+EA ./media/img/hey.xpm
+WE ./media/img/left_arrow.xpm
+S ./media/img/segfot.xpm
 
 C 50,100,200
 F 50,190,124
diff --git a/map/map_two.cub b/map/map_two.cub
index 1553c25..eb13f35 100644
--- a/map/map_two.cub
+++ b/map/map_two.cub
@@ -1,10 +1,10 @@
 R 1920 1024
 
-NO ./map/img/linuz.xpm
-SO ./map/img/linuz.xpm
-EA ./map/img/linuz.xpm
-WE ./map/img/linuz.xpm
-S ./map/img/segfot.xpm
+NO ./media/img/linuz.xpm
+SO ./media/img/linuz.xpm
+EA ./media/img/linuz.xpm
+WE ./media/img/linuz.xpm
+S ./media/img/segfot.xpm
 
 C 50,100,200
 F 150,150,124
diff --git a/map/img/BRIQUASSES.xpm b/media/img/BRIQUASSES.xpm
index 04a3e2b..04a3e2b 100644
--- a/map/img/BRIQUASSES.xpm
+++ b/media/img/BRIQUASSES.xpm
diff --git a/map/img/BRIQUASSES_2.xpm b/media/img/BRIQUASSES_2.xpm
index c2d1e06..c2d1e06 100644
--- a/map/img/BRIQUASSES_2.xpm
+++ b/media/img/BRIQUASSES_2.xpm
diff --git a/map/img/BRIQUASSE_3.xpm b/media/img/BRIQUASSE_3.xpm
index cd56455..cd56455 100644
--- a/map/img/BRIQUASSE_3.xpm
+++ b/media/img/BRIQUASSE_3.xpm
diff --git a/map/img/MURLOL.xpm b/media/img/MURLOL.xpm
index d8fcd2c..d8fcd2c 100644
--- a/map/img/MURLOL.xpm
+++ b/media/img/MURLOL.xpm
diff --git a/map/img/crapaud.xpm b/media/img/crapaud.xpm
index cbe2bad..cbe2bad 100644
--- a/map/img/crapaud.xpm
+++ b/media/img/crapaud.xpm
diff --git a/map/img/frde.xpm b/media/img/frde.xpm
index 24207a7..24207a7 100644
--- a/map/img/frde.xpm
+++ b/media/img/frde.xpm
diff --git a/map/img/hey.xpm b/media/img/hey.xpm
index 7f3e1ed..7f3e1ed 100644
--- a/map/img/hey.xpm
+++ b/media/img/hey.xpm
diff --git a/map/img/left_arrow.xpm b/media/img/left_arrow.xpm
index 45141de..45141de 100644
--- a/map/img/left_arrow.xpm
+++ b/media/img/left_arrow.xpm
diff --git a/map/img/linus.xpm b/media/img/linus.xpm
index 54073da..54073da 100644
--- a/map/img/linus.xpm
+++ b/media/img/linus.xpm
diff --git a/map/img/linuz.xpm b/media/img/linuz.xpm
index bf5934a..bf5934a 100644
--- a/map/img/linuz.xpm
+++ b/media/img/linuz.xpm
diff --git a/map/img/segfault2.xpm b/media/img/segfault2.xpm
index c4d5f22..c4d5f22 100644
--- a/map/img/segfault2.xpm
+++ b/media/img/segfault2.xpm
diff --git a/map/img/segfot.xpm b/media/img/segfot.xpm
index 63613c3..63613c3 100644
--- a/map/img/segfot.xpm
+++ b/media/img/segfot.xpm
diff --git a/map/img/terre.xpm b/media/img/terre.xpm
index 4554732..4554732 100644
--- a/map/img/terre.xpm
+++ b/media/img/terre.xpm
diff --git a/map/img/tex.xpm b/media/img/tex.xpm
index 0b1acdd..0b1acdd 100644
--- a/map/img/tex.xpm
+++ b/media/img/tex.xpm
diff --git a/revelations.mp3 b/media/sound/revelations.mp3
index 2f13585..2f13585 100755
--- a/revelations.mp3
+++ b/media/sound/revelations.mp3