diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | map/map_four.cub | 39 | ||||
| -rw-r--r-- | map/map_one.cub | 2 | ||||
| -rw-r--r-- | map/map_two.cub | 2 |
4 files changed, 34 insertions, 26 deletions
@@ -144,14 +144,6 @@ endif #--------------------------------------------------------------------------------------------------# ${NAME}: ${OBJS} ${LFT_SRCS} ${LFT_DIR}${INCS_DIR}libft.h ifeq (${OS}, Darwin) - ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -L${MLX_DIR} -lft -lmlx -lm -framework OpenGL \ --framework AppKit -else - ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -lft -lX11 -lXext -lmlx -lm -lbsd -endif -#--------------------------------------------------------------------------------------------------# -all: -ifeq (${OS}, Darwin) @$(MAKE) --no-print-directory -C ${MLX_DIR} all endif ifdef ASAN @@ -162,7 +154,14 @@ ifdef POWER else @$(MAKE) --no-print-directory -C ${LFT_DIR} all endif - @$(MAKE) --no-print-directory ${NAME} +ifeq (${OS}, Darwin) + ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -L${MLX_DIR} -lft -lmlx -lm -framework OpenGL \ +-framework AppKit +else + ${CC} ${CFLAGS} -o $@ ${OBJS} -L${LFT_DIR} -lft -lX11 -lXext -lmlx -lm -lbsd +endif +#--------------------------------------------------------------------------------------------------# +all: ${NAME} #--------------------------------------------------------------------------------------------------# clean: ifeq (${OS}, Darwin) diff --git a/map/map_four.cub b/map/map_four.cub index 40eed5b..c7563a9 100644 --- a/map/map_four.cub +++ b/map/map_four.cub @@ -1,4 +1,4 @@ -R 1400 900 +R 1600 1100 NO ./media/img/larry.xpm SO ./media/img/larry.xpm @@ -6,18 +6,27 @@ EA ./media/img/larry.xpm WE ./media/img/larry.xpm S ./media/img/larry.xpm -C 50,100,200 -F 50,190,124 +C 26,165,204 +F 24,170,25 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 E 0 0 0 1 0 0 0 0 0 0 0 1 -1 0 0 0 0 1 0 0 0 0 0 0 0 1 -1 0 0 0 0 1 0 0 0 0 0 0 0 1 -1 0 0 0 0 1 1 1 1 1 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 1 1 1 1 1 1 1 1 -1 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 0 0 0 1 -1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 1 1 1 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 E 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 1 1 1 1 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 +1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 diff --git a/map/map_one.cub b/map/map_one.cub index 97e52e7..ba4cae9 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -22,5 +22,5 @@ F 50,190,124 1 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 1 1 0 1 0 1 0 1 1 1 -1 1 1 1 0 1 1 1 1 1 1 1 0 1 0 1 1 1 +1 1 1 1 L 1 1 1 1 1 1 1 0 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 diff --git a/map/map_two.cub b/map/map_two.cub index eb13f35..c1f3e29 100644 --- a/map/map_two.cub +++ b/map/map_two.cub @@ -4,7 +4,7 @@ NO ./media/img/linuz.xpm SO ./media/img/linuz.xpm EA ./media/img/linuz.xpm WE ./media/img/linuz.xpm -S ./media/img/segfot.xpm +S ./media/img/linuz.xpm C 50,100,200 F 150,150,124 |