diff --git a/common.mk b/common.mk index b91b6da..4bfab0b 100644 --- a/common.mk +++ b/common.mk @@ -1,9 +1,21 @@ -INC = -I./inc +# **************************************************************************** # +# # +# :::::::: # +# common.mk :+: :+: # +# +:+ # +# By: whaffman +#+ # +# +#+ # +# Created: 2025/03/21 15:00:16 by whaffman #+# #+# # +# Updated: 2025/03/21 15:04:44 by whaffman ######## odam.nl # +# # +# **************************************************************************** # +INC = -I./inc VPATH = src OBJ = $(SRC:.cpp=.o) CC = c++ CFLAGS = -Wall -Wextra -Werror + all: $(NAME) $(NAME): $(OBJ) diff --git a/ex00/Makefile b/ex00/Makefile index 77a699f..5de732e 100644 --- a/ex00/Makefile +++ b/ex00/Makefile @@ -6,11 +6,10 @@ # By: whaffman +#+ # # +#+ # # Created: 2025/03/19 16:44:48 by whaffman #+# #+# # -# Updated: 2025/03/19 16:58:04 by whaffman ######## odam.nl # +# Updated: 2025/03/21 15:04:14 by whaffman ######## odam.nl # # # # **************************************************************************** # - NAME = Megaphone SRC = megaphone.cpp diff --git a/ex02/Makefile b/ex02/Makefile index d138a58..66f0625 100644 --- a/ex02/Makefile +++ b/ex02/Makefile @@ -6,14 +6,13 @@ # By: whaffman +#+ # # +#+ # # Created: 2025/03/21 11:01:22 by whaffman #+# #+# # -# Updated: 2025/03/21 14:59:23 by whaffman ######## odam.nl # +# Updated: 2025/03/21 14:59:51 by whaffman ######## odam.nl # # # # **************************************************************************** # NAME = Account SRC = Account.cpp tests.cpp - -include ../common.mk CFLAGS += -std=c++98 \ No newline at end of file diff --git a/ex02/src/Account.cpp b/ex02/src/Account.cpp index 6f20e20..e37f894 100644 --- a/ex02/src/Account.cpp +++ b/ex02/src/Account.cpp @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/03/21 11:04:19 by whaffman #+# #+# */ -/* Updated: 2025/03/21 14:45:34 by whaffman ######## odam.nl */ +/* Updated: 2025/03/21 15:03:10 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -22,7 +22,7 @@ int Account::_totalNbWithdrawals = 0; Account::Account() { - + *this = Account(0); } Account::Account( int initial_deposit )