Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUILD] Use conventional preprocessor variable name #378

Merged
merged 4 commits into from
Sep 7, 2024
Merged

[BUILD] Use conventional preprocessor variable name #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6bdca3
build: Use conventional preprocessor variable name
itislu Sep 5, 2024
c56bae4
chore: Update .gitignore file for use with `clangd` & `bear`
itislu Sep 5, 2024
a52bbd6
build: Put depenency creation flags into variable
itislu Sep 5, 2024
dcb4777
build: Move `CFLAGS` after preprocessor flags
itislu Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ dkms.conf
.vscode/
minishell
.VSCodeCounter/
.cache/
compile_commands.json
13 changes: 7 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# By: ldulling <ldulling@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2023/12/23 03:22:46 by ldulling #+# #+# #
# Updated: 2024/08/24 00:02:23 by ldulling ### ########.fr #
# Updated: 2024/09/05 10:57:10 by ldulling ### ########.fr #
# #
# **************************************************************************** #

Expand Down Expand Up @@ -49,7 +49,8 @@ CFLAGS_DBG := -ggdb3
CFLAGS_SAN := -fsanitize=address,undefined,bounds,float-divide-by-zero
CFLAGS_OPT := -O3
CFLAGS ?= $(CFLAGS_STD) $(CFLAGS_DBG)
INCFLAGS := $(addprefix -I,$(INC_DIR) $(LIB_INCLUDES))
CPPFLAGS := $(addprefix -I,$(INC_DIR) $(LIB_INCLUDES))
DEPFLAGS = -M -MP -MF $@ -MT "$(OBJ_DIR)/$*.o $@"
LDFLAGS := $(addprefix -L,$(LIBRARIES))
LDLIBS := $(addprefix -l,$(patsubst lib%,%,$(notdir $(LIBRARIES) $(LIBRARIES_EXT))))
MAKEFLAGS := -j -s
Expand All @@ -58,7 +59,7 @@ MAKEFLAGS := -j -s
# Macro definitions

include $(BUILD_DIR)/parsing_table.mk $(BUILD_DIR)/welcome_art.mk
MACROS := -D PARSING_TABLE=$(PARSING_TABLE) \
CPPFLAGS += -D PARSING_TABLE=$(PARSING_TABLE) \
-D WELCOME_ART1=$(WELCOME_ART1) \
-D WELCOME_ART2=$(WELCOME_ART2)

Expand Down Expand Up @@ -155,7 +156,7 @@ RUN := true
endif

ifeq (nocolor,$(filter nocolor,$(MAKECMDGOALS) $(MODE)))
MACROS += -D NO_COLOR=1
CPPFLAGS += -D NO_COLOR=1
RECOMPILE := true
endif

Expand Down Expand Up @@ -277,14 +278,14 @@ $(NAME) : $(LIBRARIES) $(OBJ)
# Source file compilation

$(OBJ_DIR)/%.o : $(SRC_DIR)/%.c $(BUILDFILES) | $(OBJ_SUBDIRS)
$(CC) $(CFLAGS) $(MACROS) $(INCFLAGS) -c $< -o $@ \
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ \
&& echo -n $(MSG_PROGRESS)


# Pre-processing and dependency file creation

$(DEP_DIR)/%.d : $(SRC_DIR)/%.c $(BUILDFILES) | $(DEP_SUBDIRS)
$(CC) $(CFLAGS) $(MACROS) $(INCFLAGS) -M -MP -MF $@ -MT "$(OBJ_DIR)/$*.o $@" $<
$(CC) $(CPPFLAGS) $(DEPFLAGS) $(CFLAGS) $<


# Directory structure mirroring of source files for build artifacts
Expand Down