diff options
| author | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-13 02:38:04 +0100 |
|---|---|---|
| committer | JozanLeClerc <bousset.rudy@gmail.com> | 2020-03-13 02:38:04 +0100 |
| commit | 260024bf87826df158cac1ba4ae6334f4b790bac (patch) | |
| tree | bf6b809ab28161f89f20ca425f7a565b52f0d7a6 | |
| parent | Freed leaks (diff) | |
| download | 42-cub3d-260024bf87826df158cac1ba4ae6334f4b790bac.tar.gz 42-cub3d-260024bf87826df158cac1ba4ae6334f4b790bac.tar.bz2 42-cub3d-260024bf87826df158cac1ba4ae6334f4b790bac.tar.xz 42-cub3d-260024bf87826df158cac1ba4ae6334f4b790bac.tar.zst 42-cub3d-260024bf87826df158cac1ba4ae6334f4b790bac.zip | |
Removed beta minilibx make options
| -rw-r--r-- | Makefile | 14 |
1 files changed, 1 insertions, 13 deletions
@@ -11,11 +11,7 @@ INCS_DIR = inc/ SRCS_DIR = src/ OBJS_DIR = obj/ LFT_DIR = libft/ -ifdef BETA - MLX_DIR = minilibx_beta/ -else - MLX_DIR = minilibx/ -endif +MLX_DIR = minilibx/ #==================================================================================================# #---------------------------------------------- Files ---------------------------------------------# #==================================================================================================# @@ -156,9 +152,6 @@ endif ${NAME}: ${OBJS} ${LFT_SRCS} ${LFT_DIR}${INCS_DIR}libft.h ifeq (${OS}, Darwin) @$(MAKE) --no-print-directory -C ${MLX_DIR} all -ifdef BETA - ${MV} ${MLX_DIR}libmlx.dylib ./ -endif endif ifdef ASAN @$(MAKE) --no-print-directory -C ${LFT_DIR} all ASAN=1 @@ -166,12 +159,8 @@ else @$(MAKE) --no-print-directory -C ${LFT_DIR} all endif ifeq (${OS}, Darwin) -ifdef BETA - ${CC} ${CFLAGS} -o $@ ${OBJS} -rpath ${MLX_DIR}libmlx.dylib -rpath /usr/lib/libSystem.B.dylib -L${LFT_DIR} -L./ -lft -lmlx -lm -else ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -L${MLX_DIR} -lft -lmlx -lm \ -framework OpenGL -framework AppKit -endif else ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -lft -lX11 -lXext -lmlx -lm -lbsd endif @@ -181,7 +170,6 @@ all: ${NAME} clean: ifeq (${OS}, Darwin) @$(MAKE) --no-print-directory -C ${MLX_DIR} clean - ${RM} libmlx.dylib endif @$(MAKE) --no-print-directory -C ${LFT_DIR} clean ${RM} ${OBJS_DIR} |