bonus only for github

Author: MVPee

Makefile

@@ -1,39 +1,27 @@
 NAME = cub3D
-NAME_BONUS = cub4D
 
 LIBFT = libft
 LIBMLX = MLX42/build/libmlx42.a
 
 OBJS_DIR = .objs
 
-SRCS = 	mandatory/main.c \
-		mandatory/srcs/init_and_unit/init_and_unit.c \
-		mandatory/srcs/parsing/check_file.c \
-		mandatory/srcs/parsing/check_map.c \
-		mandatory/srcs/window_and_event/window.c \
-		mandatory/srcs/window_and_event/event_hooks.c \
-		mandatory/srcs/utils/utils.c \
-		mandatory/srcs/rendering/raycasting.c \
-		mandatory/srcs/rendering/raycasting_utils.c \
-
-SRCS_BONUS = 	bonus/main.c \
-				bonus/srcs/init_and_unit/init_and_unit.c \
-				bonus/srcs/init_and_unit/init_and_unit2.c \
-				bonus/srcs/parsing/check_file.c \
-				bonus/srcs/parsing/check_map.c \
-				bonus/srcs/window_and_event/window.c \
-				bonus/srcs/window_and_event/event_hooks.c \
-				bonus/srcs/utils/utils.c \
-				bonus/srcs/utils/utils2.c \
-				bonus/srcs/rendering/raycasting/raycasting.c \
-				bonus/srcs/rendering/raycasting/raycasting_utils.c \
-				bonus/srcs/rendering/minimap/minimap.c \
-				bonus/srcs/rendering/minimap/minimap_utils.c \
-				bonus/srcs/rendering/door/door.c \
-				bonus/srcs/rendering/gun/gun.c
+SRCS = 	main.c \
+		srcs/init_and_unit/init_and_unit.c \
+		srcs/init_and_unit/init_and_unit2.c \
+		srcs/parsing/check_file.c \
+		srcs/parsing/check_map.c \
+		srcs/window_and_event/window.c \
+		srcs/window_and_event/event_hooks.c \
+		srcs/utils/utils.c \
+		srcs/utils/utils2.c \
+		srcs/rendering/raycasting/raycasting.c \
+		srcs/rendering/raycasting/raycasting_utils.c \
+		srcs/rendering/minimap/minimap.c \
+		srcs/rendering/minimap/minimap_utils.c \
+		srcs/rendering/door/door.c \
+		srcs/rendering/gun/gun.c
 
 OBJS = $(addprefix $(OBJS_DIR)/, $(SRCS:%.c=%.o))
-OBJS_BONUS = $(addprefix $(OBJS_DIR)/, $(SRCS_BONUS:%.c=%.o))
 
 OS = $(shell uname)
 FLAG_OPTI = -Ofast -ffast-math -O3
@@ -46,8 +34,8 @@ else
     $(error "Unsupported OS")
 endif
 
-CFLAGS = -I $(LIBFT) -Wall -Werror -Wextra -g -fsanitize=address
-LDFLAGS = -lft -L $(LIBFT) -Wall -Werror -Wextra -g -fsanitize=address
+CFLAGS = -I $(LIBFT) -Wall -Werror -Wextra
+LDFLAGS = -lft -L $(LIBFT) -Wall -Werror -Wextra
 
 RED=\033[0;31m
 GREEN=\033[0;32m
@@ -66,10 +54,6 @@ $(OBJS_DIR)/%.o: %.c
 	@mkdir -p $(dir $@)
 	@gcc $(CFLAGS) $(FLAG_OPTI) -c $< -o $@
 
-bonus: $(OBJS_BONUS) $(LIBFT)/libft.a
-	@gcc $(OBJS_BONUS) $(LDFLAGS) $(FLAG) $(PROJECT_FLAGS) -o $(NAME_BONUS)
-	@echo "${GREEN}./${NAME_BONUS} ${RED}bonus_map${NC}"
-
 clean:
 	$(MAKE) -C $(LIBFT) clean
 	@rm -rf $(OBJS_DIR)
@@ -82,9 +66,6 @@ fclean: clean
 re: fclean all
 
 run: all
-	./$(NAME) rsrcs/maps/cub.cub
-
-run2: bonus
-	./$(NAME_BONUS) rsrcs/maps/bonus.cub
+	./$(NAME) rsrcs/maps/bonus.cub
 
 .PHONY: all clean fclean re run bonus

bonus/includes/cub3d.h includes/cub3d.h

@@ -6,7 +6,7 @@
 /*   By: mvpee <[email protected]>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/06 13:08:32 by nechaara          #+#    #+#             */
-/*   Updated: 2024/07/18 14:47:50 by mvpee            ###   ########.fr       */
+/*   Updated: 2024/09/28 11:45:50 by mvpee            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -77,8 +77,13 @@
 # define MLX_KEY_SPACE 32
 
 // MUSIC
-# define PLAY 0
-// # define AUDIO "mpg123"
-# define AUDIO "afplay"
+# define PLAY 1
+# ifdef __linux__
+#   define AUDIO "mpg123"
+# elif __APPLE__
+#   define AUDIO "afplay"
+# else
+#   define AUDIO "mpg123"
+# endif
 
 #endif