raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: follow CC

Browse source
This commit is contained in:
Maieul BOYER 2024-04-28 20:04:19 +02:00
parent f811e55dea
commit a52d41afbe
No known key found for this signature in database
5 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Minishell.mk
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ # # By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/04/28 17:28:30 by maiboyer #+# #+# # # Created: 2024/04/28 17:28:30 by maiboyer #+# #+# #
# Updated: 2024/04/28 19:52:08 by maiboyer ### ########.fr # # Updated: 2024/04/28 20:01:05 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -57,7 +57,7 @@ END = \033[0m
.PHONY: all bonus .PHONY: all bonus
all: all:
@$(MAKE) -C ./stdme/ LIB_NAME="$(shell realpath ./stdme)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libme.a @$(MAKE) -C ./stdme/ LIB_NAME="$(shell realpath ./stdme)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" CC=$(CC) libme.a
@$(MAKE) -C ./parser/ LIB_NAME="$(shell realpath ./parser)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a @$(MAKE) -C ./parser/ LIB_NAME="$(shell realpath ./parser)/" "BUILD_DIR=$(shell realpath ./$(OBJDIRNAME))" libgmr.a
@$(MAKE) -f./Minishell.mk $(NAME) @$(MAKE) -f./Minishell.mk $(NAME)

4
parser/Makefile
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ # # By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# #
# Updated: 2024/04/28 19:05:13 by maiboyer ### ########.fr # # Updated: 2024/04/28 20:00:24 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -17,7 +17,7 @@ BONUS_FLAGS =
NAME = libgmr.a NAME = libgmr.a
LIB_NAME ?= LIB_NAME ?=
TARGET = $(BUILD_DIR)/$(NAME) TARGET = $(BUILD_DIR)/$(NAME)
CC = clang CC = cc
CFLAGS = -Wall -Wextra -Werror -g3 -MMD -I./includes CFLAGS = -Wall -Wextra -Werror -g3 -MMD -I./includes
include ./Filelist.mk include ./Filelist.mk

9
shcat_c/.clang-format
View file

@ -1,9 +0,0 @@
BasedOnStyle: Microsoft
IndentWidth: 4
ColumnLimit: 80
UseTab: Always
SortIncludes: CaseInsensitive
IndentPPDirectives: AfterHash
PPIndentWidth: 1
AllowShortIfStatementsOnASingleLine: false
AlignConsecutiveDeclarations: true

5
shcat_c/.clangd
View file

@ -1,5 +0,0 @@
CompileFlags: # Tweak the parse settings
Add:
- "-I/usr/include"
- "-I/home/maiboyer/Documents/ring-2/shcat/shcat_c/includes"

4
stdme/Makefile
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ # # By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/11/03 13:20:01 by maiboyer #+# #+# # # Created: 2023/11/03 13:20:01 by maiboyer #+# #+# #
# Updated: 2024/04/28 19:33:09 by maiboyer ### ########.fr # # Updated: 2024/04/28 20:00:43 by maiboyer ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -20,7 +20,7 @@ GENERIC_INCLUDE = output/include
NAME = libme.a NAME = libme.a
LIB_NAME ?= LIB_NAME ?=
TARGET = $(BUILD_DIR)/$(NAME) TARGET = $(BUILD_DIR)/$(NAME)
CC = clang CC ?= clang
CFLAGS = -Wno-unused-command-line-argument -Wall -Werror -Wextra -g3 -L$(BUILD_DIR) -MMD CFLAGS = -Wno-unused-command-line-argument -Wall -Werror -Wextra -g3 -L$(BUILD_DIR) -MMD
BONUS_FILES = BONUS_FILES =
LIBS_NAME = LIBS_NAME =