Skip to content

feat(cpp04): implement #82

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

Merged
airone01 merged 7 commits into from
Sep 14, 2025
Merged

feat(cpp04): implement #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df5c09b
fix(cpp04): understood the assignment
airone01 Sep 10, 2025
4969eb2
fix(cpp04): patch and add wrong parts
airone01 Sep 10, 2025
3bc044e
feat: yes
airone01 Sep 11, 2025
584d208
fix(cpp04): last corrections for ex01
airone01 Sep 12, 2025
4f4de08
build(makefile): update makefiles for the better
airone01 Sep 12, 2025
de8a39b
feat(cpp04): implement ex02
airone01 Sep 14, 2025
6137a20
build(cpp02): patch bad flags
airone01 Sep 14, 2025
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
Binary file modified .github/assets/screenshot_1.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions extra-make/art.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ COLOR_CUB3D = 251;138;79
COLOR_MINECRAFT = 252;172;61
COLOR_ARTHUR = 251;188;47

# GPM? begin make_art_mk_ansi
# **************************************************************************** #
# COMMON ANSI VARIABLES #
# **************************************************************************** #
Expand All @@ -72,4 +73,6 @@ MSG = $(TITLE) $(GPM_FNAME) $(PADDING)$(RESET) ${}
SUCCESS = $(MSG)$(GREEN)✅ Successfully built! 🚀$(RESET)
SUCCESSB = $(MSG)$(GREEN)✅ Successfully built bonuses! 🚀$(RESET)

# GPM? end make_art_mk_ansi
# GPM? end make_art_mk

Binary file modified extra-ps-visualizer-minecraft/.github/assets/screenshot_1.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified extra-ps-visualizer-minecraft/assets/logo-64x64.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 8 additions & 14 deletions milestone-4-cpp00/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# **************************************************************************** #

include $(realpath ../extra-make/art.mk)# GPM!
# GPM: make_art_mk
# GPM: make_art_mk_ansi
COLOR = 250;119;85

# **************************************************************************** #
Expand All @@ -31,8 +31,6 @@ GPM_MNAME := CPP00
# **************************************************************************** #

include $(realpath ../extra-make/commands.mk)
CXX = c++
CXXFLAGS = -Wall -Wextra -Werror -std=c++98

# **************************************************************************** #
# TARGETS #
Expand All @@ -53,30 +51,26 @@ ex02: title
@$(MAKE) -sC ex02

title:
@$(ECHO) "$(MSG) ___ ___\n"
@$(ECHO) "$(MSG) _______ ___ / _ \\/ _ \\ \n"
@$(ECHO) "$(MSG) / __/ _ \\/ _ \\/ // / // /\n"
@$(ECHO) "$(MSG) \__/ .__/ .__/\\___/\\___/\n"
@$(ECHO) "$(MSG) /_/ /_/\n"
@$(ECHO) "$(MSG) ___ ___\n"
@$(ECHO) "$(MSG) _______ ___ / _ \\/ _ \\ \n"
@$(ECHO) "$(MSG)/ __/ _ \\/ _ \\/ // / // /\n"
@$(ECHO) "$(MSG)\__/ .__/ .__/\\___/\\___/\n"
@$(ECHO) "$(MSG) /_/ /_/\n"
@$(ECHO) "$(MSG) \n"

clean:
@$(ECHO) "$(MSG)🧹 Cleaning cpp00\n"
@$(ECHO) "$(MSG)🧹 Cleaning $(GPM_NAME)\n"
@$(MAKE) -sC ex00 clean
@$(MAKE) -sC ex01 clean
@$(MAKE) -sC ex02 clean

fclean:
@$(ECHO) "$(MSG)🧹 Fcleaning cpp00\n"
@$(ECHO) "$(MSG)🧹 Fcleaning $(GPM_NAME)\n"
@$(MAKE) -sC ex00 fclean
@$(MAKE) -sC ex01 fclean
@$(MAKE) -sC ex02 fclean

re: fclean all

# GPM: make_sources_mk

# GPM: make_commands_mk

MAKEFLAGS += --no-print-directory
.PHONY: all clean fclean re title ex00 ex01 ex02
4 changes: 2 additions & 2 deletions milestone-4-cpp00/ex00/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# By: elagouch <elagouch@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/06/22 12:00:00 by elagouch #+# #+# #
# Updated: 2025/06/22 12:45:56 by elagouch ### ########.fr #
# Updated: 2025/09/12 16:57:31 by elagouch ### ########.fr #
# #
# **************************************************************************** #

Expand All @@ -21,7 +21,7 @@ all: $(NAME)
$(NAME): $(OBJ)
$(CXX) $(CXXFLAGS) -o $(NAME) $(OBJ)

%.o: %.cpp
%.o: %.cpp Makefile
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
Expand Down
2 changes: 1 addition & 1 deletion milestone-4-cpp00/ex01/Contact.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Contact {
Contact();
~Contact();

Contact &operator=(const Contact &other);
Contact &operator=(const Contact &);

std::string getFirstName();
std::string getLastName();
Expand Down
11 changes: 6 additions & 5 deletions milestone-4-cpp00/ex01/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,33 @@
# By: elagouch <elagouch@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/06/22 12:00:00 by elagouch #+# #+# #
# Updated: 2025/06/22 13:33:06 by elagouch ### ########.fr #
# Updated: 2025/09/12 16:57:14 by elagouch ### ########.fr #
# #
# **************************************************************************** #

NAME = phonebook
CXX = c++
CXXFLAGS = -Wall -Wextra -Werror -std=c++98 -g3
CXXFLAGS = -Wall -Wextra -Werror -std=c++98 -MMD -MP
SRC = main.cpp PhoneBook.cpp Contact.cpp
OBJ = $(SRC:.cpp=.o)
HEADERS = Contact.hpp PhoneBook.hpp

all: $(NAME)

$(NAME): $(OBJ)
$(CXX) $(CXXFLAGS) -o $(NAME) $(OBJ)

%.o: %.cpp $(HEADERS)
%.o: %.cpp Makefile
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
$(RM) $(OBJ)
$(RM) $(OBJ) $(SRC:.cpp=.d)

fclean: clean
$(RM) $(NAME)

re: fclean all

-include $(SRC:.cpp=.d)

.PHONY: all clean fclean re

11 changes: 6 additions & 5 deletions milestone-4-cpp00/ex02/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,33 @@
# By: elagouch <elagouch@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/06/22 12:00:00 by elagouch #+# #+# #
# Updated: 2025/06/30 19:33:19 by elagouch ### ########.fr #
# Updated: 2025/09/12 16:56:55 by elagouch ### ########.fr #
# #
# **************************************************************************** #

NAME = bank
CXX = c++
CXXFLAGS = -Wall -Wextra -Werror -std=c++98 -g3
CXXFLAGS = -Wall -Wextra -Werror -std=c++98 -MMD -MP
SRC = tests.cpp Account.cpp
OBJ = $(SRC:.cpp=.o)
HEADERS = Account.hpp

all: $(NAME)

$(NAME): $(OBJ)
$(CXX) $(CXXFLAGS) -o $(NAME) $(OBJ)

%.o: %.cpp $(HEADERS)
%.o: %.cpp Makefile
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
$(RM) $(OBJ)
$(RM) $(OBJ) $(SRC:.cpp=.d)

fclean: clean
$(RM) $(NAME)

re: fclean all

-include $(SRC:.cpp=.d)

.PHONY: all clean fclean re

94 changes: 94 additions & 0 deletions milestone-4-cpp01/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Makefile :+: :+: :+: #
# +:+ +:+ +:+ #
# By: elagouch <elagouch@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/06/22 12:35:35 by elagouch #+# #+# #
# Updated: 2025/08/26 19:16:05 by elagouch ### ########.fr #
# #
# **************************************************************************** #

# **************************************************************************** #
# ANSI COLOR CODES #
# **************************************************************************** #

include $(realpath ../extra-make/art.mk)# GPM!
# GPM: make_art_mk_ansi
COLOR = 250;119;85

# **************************************************************************** #
# METADATA #
# **************************************************************************** #

GPM_MSTONE := 4
GPM_NAME := cpp01
GPM_MNAME := CPP01

# **************************************************************************** #
# COMMANDS #
# **************************************************************************** #

include $(realpath ../extra-make/commands.mk)

# **************************************************************************** #
# TARGETS #
# **************************************************************************** #

all: ex00 ex01 ex02 ex03 ex04 ex05

ex00: title
@$(ECHO) "$(MSG)🏗️ Building ex00: BraiiiiiiinnnzzzZ\n"
@$(MAKE) -sC ex00

ex01: title
@$(ECHO) "$(MSG)🏗️ Building ex01: Moar brainz!\n"
@$(MAKE) -sC ex01

ex02: title
@$(ECHO) "$(MSG)🏗️ Building ex02: HI THIS IS BRAIN\n"
@$(MAKE) -sC ex02

ex03: title
@$(ECHO) "$(MSG)🏗️ Building ex03: Unnecessary violence\n"
@$(MAKE) -sC ex03

ex04: title
@$(ECHO) "$(MSG)🏗️ Building ex04: Sed is for losers\n"
@$(MAKE) -sC ex04

ex05: title
@$(ECHO) "$(MSG)🏗️ Building ex05: Harl 2.0\n"
@$(MAKE) -sC ex05

title:
@$(ECHO) "$(MSG) ___ ___ \n"
@$(ECHO) "$(MSG) _______ ___ / _ < / \n"
@$(ECHO) "$(MSG)/ __/ _ \\/ _ \\/ // / / \n"
@$(ECHO) "$(MSG)\\__/ .__/ .__/\\___/_/ \n"
@$(ECHO) "$(MSG) /_/ /_/ \n"
@$(ECHO) "$(MSG) \n"

clean:
@$(ECHO) "$(MSG)🧹 Cleaning $(GPM_NAME)\n"
@$(MAKE) -sC ex00 clean
@$(MAKE) -sC ex01 clean
@$(MAKE) -sC ex02 clean
@$(MAKE) -sC ex03 clean
@$(MAKE) -sC ex04 clean
@$(MAKE) -sC ex05 clean

fclean:
@$(ECHO) "$(MSG)🧹 Fcleaning $(GPM_NAME)\n"
@$(MAKE) -sC ex00 fclean
@$(MAKE) -sC ex01 fclean
@$(MAKE) -sC ex02 fclean
@$(MAKE) -sC ex03 fclean
@$(MAKE) -sC ex04 fclean
@$(MAKE) -sC ex05 fclean

re: fclean all

MAKEFLAGS += --no-print-directory
.PHONY: all clean fclean re title ex00 ex01 ex02 ex03 ex04 ex05
10 changes: 6 additions & 4 deletions milestone-4-cpp01/ex00/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
# By: elagouch <elagouch@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/06/22 12:00:00 by elagouch #+# #+# #
# Updated: 2025/08/20 12:55:18 by elagouch ### ########.fr #
# Updated: 2025/09/12 16:56:24 by elagouch ### ########.fr #
# #
# **************************************************************************** #

NAME = brainz
CXX = c++
CXXFLAGS = -Wall -Wextra -Werror -std=c++98
CXXFLAGS = -Wall -Wextra -Werror -std=c++98 -MMD -MP
SRC = main.cpp Zombie.cpp newZombie.cpp randomChump.cpp
OBJ = $(SRC:.cpp=.o)

Expand All @@ -21,16 +21,18 @@ all: $(NAME)
$(NAME): $(OBJ)
$(CXX) $(CXXFLAGS) -o $(NAME) $(OBJ)

%.o: %.cpp
%.o: %.cpp Makefile
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
$(RM) $(OBJ)
$(RM) $(OBJ) $(SRC:.cpp=.d)

fclean: clean
$(RM) $(NAME)

re: fclean all

-include $(SRC:.cpp=.d)

.PHONY: all clean fclean re

10 changes: 6 additions & 4 deletions milestone-4-cpp01/ex01/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
# By: elagouch <elagouch@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/06/22 12:00:00 by elagouch #+# #+# #
# Updated: 2025/08/21 16:25:37 by elagouch ### ########.fr #
# Updated: 2025/09/12 16:56:06 by elagouch ### ########.fr #
# #
# **************************************************************************** #

NAME = more_brainz
CXX = c++
CXXFLAGS = -Wall -Wextra -Werror -std=c++98
CXXFLAGS = -Wall -Wextra -Werror -std=c++98 -MMD -MP
SRC = main.cpp Zombie.cpp zombieHorde.cpp
OBJ = $(SRC:.cpp=.o)

Expand All @@ -21,16 +21,18 @@ all: $(NAME)
$(NAME): $(OBJ)
$(CXX) $(CXXFLAGS) -o $(NAME) $(OBJ)

%.o: %.cpp
%.o: %.cpp Makefile
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
$(RM) $(OBJ)
$(RM) $(OBJ) $(SRC:.cpp=.d)

fclean: clean
$(RM) $(NAME)

re: fclean all

-include $(SRC:.cpp=.d)

.PHONY: all clean fclean re

4 changes: 2 additions & 2 deletions milestone-4-cpp01/ex02/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# By: elagouch <elagouch@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/08/21 17:01:11 by elagouch #+# #+# #
# Updated: 2025/08/21 17:01:43 by elagouch ### ########.fr #
# Updated: 2025/09/12 16:57:42 by elagouch ### ########.fr #
# #
# **************************************************************************** #

Expand All @@ -22,7 +22,7 @@ all: $(NAME)
$(NAME): $(OBJ)
$(CXX) $(CXXFLAGS) -o $(NAME) $(OBJ)

%.o: %.cpp
%.o: %.cpp Makefile
$(CXX) $(CXXFLAGS) -c $< -o $@

clean:
Expand Down
Loading