aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f7f9c1e..c437182 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,11 @@ SRCS_NAME += ft_init_s_ray.c
SRCS_NAME += ft_init_map.c
SRCS_NAME += ft_tex_init.c
SRCS_NAME += ft_detect.c
+<<<<<<< HEAD
SRCS_NAME += ft_check_ext.c
+=======
+SRCS_NAME += ft_draw_textures.c
+>>>>>>> 8a89388d397b50f2c70cef05f8fa6cfa10cc213c
#--------------------------------------------------------------------------------------------------#
SRCS = $(addprefix ${SRCS_DIR},${SRCS_NAME})
#--------------------------------------------------------------------------------------------------#