diff options
| -rw-r--r-- | Makefile | 27 | ||||
| -rw-r--r-- | minilibx/Makefile (renamed from libmlx/Makefile) | 0 | ||||
| -rw-r--r-- | minilibx/font.c (renamed from libmlx/font.c) | 0 | ||||
| -rw-r--r-- | minilibx/font.xcf (renamed from libmlx/font.xcf) | bin | 52570 -> 52570 bytes | |||
| -rw-r--r-- | minilibx/mlx.h (renamed from libmlx/mlx.h) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_init_loop.m (renamed from libmlx/mlx_init_loop.m) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_int.h (renamed from libmlx/mlx_int.h) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_int_str_to_wordtab.c (renamed from libmlx/mlx_int_str_to_wordtab.c) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_mouse.m (renamed from libmlx/mlx_mouse.m) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_new_image.m (renamed from libmlx/mlx_new_image.m) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_new_window.h (renamed from libmlx/mlx_new_window.h) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_new_window.m (renamed from libmlx/mlx_new_window.m) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_opengl.h (renamed from libmlx/mlx_opengl.h) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_opengl.m (renamed from libmlx/mlx_opengl.m) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_png.c (renamed from libmlx/mlx_png.c) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_png.h (renamed from libmlx/mlx_png.h) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_rgb.c (renamed from libmlx/mlx_rgb.c) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_shaders.c (renamed from libmlx/mlx_shaders.c) | 0 | ||||
| -rw-r--r-- | minilibx/mlx_xpm.c (renamed from libmlx/mlx_xpm.c) | 0 |
19 files changed, 15 insertions, 12 deletions
@@ -10,7 +10,7 @@ INCS_DIR = inc/ SRCS_DIR = src/ OBJS_DIR = obj/ LFT_DIR = libft/ -MLX_DIR = libmlx/ +MLX_DIR = minilibx/ #==============================================================================# #--------------------------------- Files --------------------------------------# #==============================================================================# @@ -44,6 +44,17 @@ SRCS = $(addprefix ${SRCS_DIR},${SRCS_NAME}) #------------------------------------------------------------------------------# OBJS = $(patsubst ${SRCS_DIR}%.c,${OBJS_DIR}%.o,${SRCS}) #==============================================================================# +#--------------------------------- UNIX ---------------------------------------# +#==============================================================================# +MKDIR = mkdir -p +RM = rm -rf +OS = $(shell uname) +ifeq (${OS}, Darwin) + SCR_SZE = 1980x1024 +else + SCR_SZE = $(shell xdpyinfo | grep dimensions | awk '{print $$2}') +endif +#==============================================================================# #-------------------------------- Compiler ------------------------------------# #==============================================================================# CC = clang @@ -67,17 +78,9 @@ else NAME = a.out endif #==============================================================================# -#--------------------------------- UNIX ---------------------------------------# -#==============================================================================# -MKDIR = mkdir -p -RM = rm -rf -OS = $(shell uname) -SCR_SZE = $(shell xdpyinfo | grep dimensions | awk '{print $$2}') -#==============================================================================# #--------------------------------- Rules --------------------------------------# #==============================================================================# ${OBJS_DIR}%.o: ${SRCS_DIR}%.c ${INCS_DIR}${INCS} - echo ${SCR_SIZE} @${MKDIR} ${OBJS_DIR} ifeq (${OS}, Darwin) ${CC} -c ${CFLAGS} -I${LFT_DIR}${INCS_DIR} -I${MLX_DIR} -I${INCS_DIR} -o $@ $< @@ -97,12 +100,12 @@ endif #------------------------------------------------------------------------------# all: ifeq (${OS}, Darwin) - @$(MAKE) --no-print-directory -C ${MLX_DIR} all + @$(MAKE) --jobs 5 --no-print-directory -C ${MLX_DIR} all endif ifdef ASAN - @$(MAKE) --no-print-directory -C ${LFT_DIR} all ASAN=1 + @$(MAKE) --jobs 5 --no-print-directory -C ${LFT_DIR} all ASAN=1 else - @$(MAKE) --no-print-directory -C ${LFT_DIR} all + @$(MAKE) --jobs 5 --no-print-directory -C ${LFT_DIR} all endif @$(MAKE) ${NAME} #------------------------------------------------------------------------------# diff --git a/libmlx/Makefile b/minilibx/Makefile index 2e44836..2e44836 100644 --- a/libmlx/Makefile +++ b/minilibx/Makefile diff --git a/libmlx/font.c b/minilibx/font.c index 656d248..656d248 100644 --- a/libmlx/font.c +++ b/minilibx/font.c diff --git a/libmlx/font.xcf b/minilibx/font.xcf Binary files differindex b9c8c82..b9c8c82 100644 --- a/libmlx/font.xcf +++ b/minilibx/font.xcf diff --git a/libmlx/mlx.h b/minilibx/mlx.h index e75b4af..e75b4af 100644 --- a/libmlx/mlx.h +++ b/minilibx/mlx.h diff --git a/libmlx/mlx_init_loop.m b/minilibx/mlx_init_loop.m index 0377771..0377771 100644 --- a/libmlx/mlx_init_loop.m +++ b/minilibx/mlx_init_loop.m diff --git a/libmlx/mlx_int.h b/minilibx/mlx_int.h index a93c1c9..a93c1c9 100644 --- a/libmlx/mlx_int.h +++ b/minilibx/mlx_int.h diff --git a/libmlx/mlx_int_str_to_wordtab.c b/minilibx/mlx_int_str_to_wordtab.c index 3b2ef2e..3b2ef2e 100644 --- a/libmlx/mlx_int_str_to_wordtab.c +++ b/minilibx/mlx_int_str_to_wordtab.c diff --git a/libmlx/mlx_mouse.m b/minilibx/mlx_mouse.m index 94ce0a9..94ce0a9 100644 --- a/libmlx/mlx_mouse.m +++ b/minilibx/mlx_mouse.m diff --git a/libmlx/mlx_new_image.m b/minilibx/mlx_new_image.m index 46e1df1..46e1df1 100644 --- a/libmlx/mlx_new_image.m +++ b/minilibx/mlx_new_image.m diff --git a/libmlx/mlx_new_window.h b/minilibx/mlx_new_window.h index d173e61..d173e61 100644 --- a/libmlx/mlx_new_window.h +++ b/minilibx/mlx_new_window.h diff --git a/libmlx/mlx_new_window.m b/minilibx/mlx_new_window.m index 6d4fea4..6d4fea4 100644 --- a/libmlx/mlx_new_window.m +++ b/minilibx/mlx_new_window.m diff --git a/libmlx/mlx_opengl.h b/minilibx/mlx_opengl.h index bb39267..bb39267 100644 --- a/libmlx/mlx_opengl.h +++ b/minilibx/mlx_opengl.h diff --git a/libmlx/mlx_opengl.m b/minilibx/mlx_opengl.m index 554d79b..554d79b 100644 --- a/libmlx/mlx_opengl.m +++ b/minilibx/mlx_opengl.m diff --git a/libmlx/mlx_png.c b/minilibx/mlx_png.c index ca8024d..ca8024d 100644 --- a/libmlx/mlx_png.c +++ b/minilibx/mlx_png.c diff --git a/libmlx/mlx_png.h b/minilibx/mlx_png.h index 83ef145..83ef145 100644 --- a/libmlx/mlx_png.h +++ b/minilibx/mlx_png.h diff --git a/libmlx/mlx_rgb.c b/minilibx/mlx_rgb.c index 3f98717..3f98717 100644 --- a/libmlx/mlx_rgb.c +++ b/minilibx/mlx_rgb.c diff --git a/libmlx/mlx_shaders.c b/minilibx/mlx_shaders.c index 4a58955..4a58955 100644 --- a/libmlx/mlx_shaders.c +++ b/minilibx/mlx_shaders.c diff --git a/libmlx/mlx_xpm.c b/minilibx/mlx_xpm.c index 78d8c9b..78d8c9b 100644 --- a/libmlx/mlx_xpm.c +++ b/minilibx/mlx_xpm.c |