cleaned some stuff

This commit is contained in:
djonker 2023-10-26 11:01:31 +02:00
parent 324929acdd
commit 6d55ae40ed
5 changed files with 24 additions and 25 deletions

3
.gitignore vendored
View File

@ -1,8 +1,9 @@
*.pdf *.pdf
*.o *.o
*.a *.a
fract-ol cub3d
LICENSE LICENSE
mlx/build
obj obj
.git .git
.ccls-cache .ccls-cache

View File

@ -1,29 +1,28 @@
# **************************************************************************** # # **************************************************************************** #
# # # #
# .--. _ # # :::::::: #
# Makefile :+: :+: # # Makefile :+: :+: #
# |:_/ || |_ _ ___ __ # # +:+ #
# By: djonker <djonker@student.codam.nl> // \ \ __| | | \ \/ / # # By: houtworm <codam@houtworm.net> +#+ #
# (| | )|_| |_| |> < # # +#+ #
# Created: 2022/11/24 10:12:10 by djonker /'\_ _/`\__|\__,_/_/\_\ # # Created: 2023/10/26 10:46:29 by houtworm #+# #+# #
# Updated: 2023/10/26 10:43:49 by houtworm ######## odam.nl # # Updated: 2023/10/26 10:56:42 by houtworm ######## odam.nl #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME =cub3d NAME =cub3d
CC =gcc CC =gcc
FC =-Wall -Werror -Wextra -Wunreachable-code -Ofast #-fsanitize=address FC =-Wall -Werror -Wextra -Wunreachable-code -Ofast -g #-fsanitize=address
HEAD =-I ./include -I $(MLX)/include HEAD =-I ./include -I $(MLX)/include
RM =rm -rf RM =rm -rf
UNAME_S :=$(shell uname -s)
LIB =libft/libft.a mlx/build/libmlx42.a -ldl -lglfw -pthread -lm LIB =libft/libft.a mlx/build/libmlx42.a -ldl -lglfw -pthread -lm
SRC =src/main.c SRC =src/main.c
OBJ =$(SRC:src/%.c=obj/%.o) OBJ =$(SRC:src/%.c=obj/%.o)
all: libft libmlx $(NAME) all: libft mlx/build/mlx42.a $(NAME)
clean: clean:
@$(RM) -r obj @$(RM) obj
@$(MAKE) -C libft clean > /dev/null @$(MAKE) -C libft clean > /dev/null
@$(MAKE) -C mlx/build clean > /dev/null @$(MAKE) -C mlx/build clean > /dev/null
@printf "\e[1;35mCleaned Object Files\n\e[0;00m" @printf "\e[1;35mCleaned Object Files\n\e[0;00m"
@ -48,7 +47,7 @@ $(NAME): $(OBJ)
libft: libft:
@$(MAKE) -C libft all @$(MAKE) -C libft all
libmlx: mlx/build/mlx42.a:
@cmake -S mlx -B mlx/build @cmake -S mlx -B mlx/build
@$(MAKE) -C mlx/build -j4 @$(MAKE) -C mlx/build -j4

BIN
cub3d

Binary file not shown.

13
cub3d.h
View File

@ -1,16 +1,15 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* cub3d.h :+: :+: */ /* cub3d.h :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: houtworm <codam@houtworm.net> +#+ +:+ +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2022/11/29 03:25:46 by houtworm #+# #+# */ /* Created: 2023/10/26 10:46:35 by houtworm #+# #+# */
/* Updated: 2023/10/26 10:37:13 by houtworm ######## odam.nl */ /* Updated: 2023/10/26 10:47:00 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef CUB3D_H #ifndef CUB3D_H
# define CUB3D_H # define CUB3D_H

View File

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* main.c :+: :+: */ /* main.c :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: houtworm <codam@houtworm.net> +#+ +:+ +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2022/12/13 08:03:00 by houtworm #+# #+# */ /* Created: 2023/10/26 10:46:22 by houtworm #+# #+# */
/* Updated: 2023/10/26 10:44:41 by houtworm ######## odam.nl */ /* Updated: 2023/10/26 10:46:24 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */