diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -11,7 +11,11 @@ INCS_DIR = inc/ SRCS_DIR = src/ OBJS_DIR = obj/ LFT_DIR = libft/ -MLX_DIR = minilibx/ +ifdef BETA + MLX_DIR = minilibx_beta/ +else + MLX_DIR = minilibx/ +endif #==================================================================================================# #---------------------------------------------- Files ---------------------------------------------# #==================================================================================================# @@ -42,6 +46,7 @@ SRCS_NAME += ft_get_skybox.c SRCS_NAME += ft_get_player_spawn.c SRCS_NAME += ft_get_music.c SRCS_NAME += ft_get_darkness.c +SRCS_NAME += ft_get_traps.c SRCS_NAME += ft_set_minimap_scale.c SRCS_NAME += ft_check_missing.c SRCS_NAME += ft_check_not_found.c @@ -81,6 +86,10 @@ SRCS_NAME += ft_treat_args.c SRCS_NAME += ft_init_funptr.c SRCS_NAME += ft_init_bmp.c SRCS_NAME += ft_floor_cast.c +SRCS_NAME += ft_floor_cast_inits.c +SRCS_NAME += ft_suffer_animation.c +SRCS_NAME += ft_draw_traps.c +SRCS_NAME += ft_draw_traps_extra.c #--------------------------------------------------------------------------------------------------# SRCS = $(addprefix ${SRCS_DIR},${SRCS_NAME}) #--------------------------------------------------------------------------------------------------# @@ -92,6 +101,7 @@ LFT_SRCS = $(shell find libft/src -name "*.c") #==================================================================================================# MKDIR = mkdir -p RM = rm -rf +MV = mv OS = $(shell uname) ifeq (${OS}, Darwin) SCR_SZE = $(shell osascript -e 'tell application "Finder" to get bounds of window of desktop' \ @@ -150,6 +160,9 @@ 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 @@ -157,8 +170,12 @@ 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 @@ -168,6 +185,7 @@ 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} |