aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRudy Bousset <rbousset@z2r5p2.le-101.fr>2020-02-24 16:55:29 +0100
committerRudy Bousset <rbousset@z2r5p2.le-101.fr>2020-02-24 16:55:29 +0100
commit4398737487faae70fba6e68ab7050d4d23ebf1bc (patch)
tree3a156777d206aefb76a21863e015f8309f2186af /Makefile
parentcomming soon (diff)
download42-cub3d-4398737487faae70fba6e68ab7050d4d23ebf1bc.tar.gz
42-cub3d-4398737487faae70fba6e68ab7050d4d23ebf1bc.tar.bz2
42-cub3d-4398737487faae70fba6e68ab7050d4d23ebf1bc.tar.xz
42-cub3d-4398737487faae70fba6e68ab7050d4d23ebf1bc.tar.zst
42-cub3d-4398737487faae70fba6e68ab7050d4d23ebf1bc.zip
Map update
Diffstat (limited to '')
-rw-r--r--Makefile17
1 files changed, 8 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 9db2ba1..9332243 100644
--- a/Makefile
+++ b/Makefile
@@ -144,14 +144,6 @@ 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
ifdef ASAN
@@ -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)