From 4398737487faae70fba6e68ab7050d4d23ebf1bc Mon Sep 17 00:00:00 2001 From: Rudy Bousset Date: Mon, 24 Feb 2020 16:55:29 +0100 Subject: Map update --- Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9db2ba1..9332243 100644 --- a/Makefile +++ b/Makefile @@ -143,14 +143,6 @@ else endif #--------------------------------------------------------------------------------------------------# ${NAME}: ${OBJS} ${LFT_SRCS} ${LFT_DIR}${INCS_DIR}libft.h -ifeq (${OS}, Darwin) - ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -L${MLX_DIR} -lft -lmlx -lm -framework OpenGL \ --framework AppKit -else - ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -lft -lX11 -lXext -lmlx -lm -lbsd -endif -#--------------------------------------------------------------------------------------------------# -all: ifeq (${OS}, Darwin) @$(MAKE) --no-print-directory -C ${MLX_DIR} all endif @@ -162,7 +154,14 @@ ifdef POWER else @$(MAKE) --no-print-directory -C ${LFT_DIR} all endif - @$(MAKE) --no-print-directory ${NAME} +ifeq (${OS}, Darwin) + ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -L${MLX_DIR} -lft -lmlx -lm -framework OpenGL \ +-framework AppKit +else + ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -lft -lX11 -lXext -lmlx -lm -lbsd +endif +#--------------------------------------------------------------------------------------------------# +all: ${NAME} #--------------------------------------------------------------------------------------------------# clean: ifeq (${OS}, Darwin) -- cgit v1.2.3