diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:47:59 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:47:59 +0100 |
| commit | 5c908cdcd9c09ee4e5656ddc62ca1153f630354a (patch) | |
| tree | f9efc3e226ca87904cab92716c65b051b11c304d /Makefile | |
| parent | Removed "vim" map (diff) | |
| parent | small but important changes (diff) | |
| download | 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.gz 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.bz2 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.xz 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.zst 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.zip | |
Merge branch 'tex_fmoen' of gitlab.com into tex_fmoen
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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}) #--------------------------------------------------------------------------------------------------# |