diff options
author | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-22 20:01:27 +0100 |
---|---|---|
committer | Rudy Bousset <rbousset@z2r5p2.le-101.fr> | 2020-02-22 20:01:27 +0100 |
commit | ad92e4a76abf9d6cc52488a4a6c22406f60d485a (patch) | |
tree | 845e0059f5c6d848d873baa3d25a9c49927a5dda /Makefile | |
parent | Best Makefile (diff) | |
download | 42-cub3d-ad92e4a76abf9d6cc52488a4a6c22406f60d485a.tar.gz 42-cub3d-ad92e4a76abf9d6cc52488a4a6c22406f60d485a.tar.bz2 42-cub3d-ad92e4a76abf9d6cc52488a4a6c22406f60d485a.tar.xz 42-cub3d-ad92e4a76abf9d6cc52488a4a6c22406f60d485a.tar.zst 42-cub3d-ad92e4a76abf9d6cc52488a4a6c22406f60d485a.zip |
Makefile update, better directory tree
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -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 |