Skip to content

Commit 0701d32

Browse files
authored
Merge pull request #38 from joppiesaus/patch-5
automatically recompile when a header file changes
2 parents 8a3c63d + d8c7b4a commit 0701d32

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# By: W2Wizard <[email protected]> +#+ #
77
# +#+ #
88
# Created: 2022/02/26 21:32:49 by W2Wizard #+# #+# #
9-
# Updated: 2022/03/29 18:08:51 by W2Wizard ######## odam.nl #
9+
# Updated: 2022/07/05 14:55:30 by jobvan-d ######## odam.nl #
1010
# #
1111
# **************************************************************************** #
1212

@@ -33,6 +33,7 @@ SHDR := $(SHDR:$(SHADER_DIR)/default.%=$(SRC_DIR)/mlx_%_shader.c)
3333
LIB := $(call rwildcard,$(LIB_DIR),*.c)
3434
SRCS := $(call rwildcard,$(SRC_DIR),*.c)
3535
OBJS := $(sort $(patsubst %.c,%.o,$(SRCS) $(LIB) $(SHDR)))
36+
MLX_HEADER_FILES := $(call rwildcard,$(INCLUDE_DIR),*.h)
3637

3738
ifeq ($(OS), Windows_NT)
3839
ifdef WIN_UNIX

Makefile_Unix.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# By: W2Wizard <[email protected]> +#+ #
77
# +#+ #
88
# Created: 2022/02/26 21:36:38 by W2Wizard #+# #+# #
9-
# Updated: 2022/02/26 22:12:31 by W2Wizard ######## odam.nl #
9+
# Updated: 2022/07/05 14:53:23 by jobvan-d ######## odam.nl #
1010
# #
1111
# **************************************************************************** #
1212

@@ -24,10 +24,10 @@ RESET := \033[0m
2424

2525
#//= Make Rules =//#
2626
$(NAME): $(OBJS)
27-
@ar rc $(NAME) $(OBJS)
27+
@ar rc $@ $^
2828
@echo "$(GREEN)$(BOLD)Done$(RESET)"
2929

30-
%.o: %.c
30+
%.o: %.c $(MLX_HEADER_FILES)
3131
@echo "$(GREEN)$(BOLD)Compiling: $(notdir $<)$(RESET)"
3232
@$(CC) $(CFLAGS) -o $@ -c $< $(HEADERS)
3333

Makefile_WindowsNT.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# By: W2Wizard <[email protected]> +#+ #
77
# +#+ #
88
# Created: 2022/02/26 21:32:00 by W2Wizard #+# #+# #
9-
# Updated: 2022/02/26 21:32:00 by W2Wizard ######## odam.nl #
9+
# Updated: 2022/07/05 14:55:05 by jobvan-d ######## odam.nl #
1010
# #
1111
# **************************************************************************** #
1212

@@ -24,13 +24,14 @@ SHDR := $(subst /,\,$(SHDR))
2424
LIB := $(subst /,\,$(LIB))
2525
SRCS := $(subst /,\,$(SRCS))
2626
OBJS := $(subst /,\,$(OBJS))
27+
MLX_HEADER_FILES := $(subst /,\,$(MLX_HEADER_FILES))
2728

2829
#//= Make Rules =//#
2930
$(NAME): $(OBJS)
30-
@ar rc $(NAME) $(OBJS)
31+
@ar rc $@ $^
3132
@echo Done
3233

33-
%.o: %.c
34+
%.o: %.c $(MLX_HEADER_FILES)
3435
@echo Compiling: $(notdir $<)
3536
@$(CC) $(CFLAGS) -o $@ -c $< $(HEADERS)
3637

0 commit comments

Comments
 (0)