From: Lukas Jiriste <ljiriste@student.42prague.com>
Date: Fri, 17 Jan 2025 10:04:11 +0000 (+0100)
Subject: Merge branch 'help' into trunk
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=a0a5f04315ecb6cd8fa65cafa9119aadcc60229e;p=42%2FminiRT.git

Merge branch 'help' into trunk
---

a0a5f04315ecb6cd8fa65cafa9119aadcc60229e
diff --cc Makefile
index 8363fde,a6836ac..5a5b4b8
--- a/Makefile
+++ b/Makefile
@@@ -21,21 -21,11 +21,22 @@@ INCLUDE := $(addprefix -I, $(INCDIR)
  SRCDIR := src
  
  SOURCES :=	main.c				\
 -			scene.c				\
  			manipulation.c		\
 -			parsing.c			\
 +			tokenize.c			\
 +			parse.c				\
 +			parse_rt.c			\
 +			parse_small.c		\
 +			parse_elements.c	\
 +			scene.c				\
 +			scene_helpers.c		\
 +			intersect.c			\
 +			circumsphere.c		\
 +			cylinder.c			\
 +			sphere.c			\
 +			plane.c				\
 +			object_color.c		\
  			vec3.c				\
+ 			utils.c				\
  
  SOURCES := $(addprefix $(SRCDIR)/, $(SOURCES))