From e0c565f7ff7620dca9dfc6c607f4798f5291c7bf Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Tue, 28 Jul 2015 14:19:00 +0400 Subject: Go back to C and adapt code --- kernel/Helpers/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kernel/Helpers/Makefile') diff --git a/kernel/Helpers/Makefile b/kernel/Helpers/Makefile index 76805bd..a813312 100644 --- a/kernel/Helpers/Makefile +++ b/kernel/Helpers/Makefile @@ -1,23 +1,23 @@ EXEC=helpers.o - all:$(EXEC) #----- Helpers ----- -$(EXEC): memory.o memPrint.o - ld -m elf_i386 -r -o $(EXEC) $^ +$(EXEC): memory.o memprint.o +# ld -m elf_i386 -r -o $(EXEC) $^ + ar -r -o $(EXEC) $^ #--------------- #----- Memory ----- -memory.o: memory.cpp memory.hpp - $(CXX) -c -o $@ $< +memory.o: memory.c memory.h + $(CC) $(CFLAGS) -c -o $@ $< #------------------ #----- memPrint ----- -memPrint.o: memPrint.cpp memPrint.hpp - $(CXX) -c -o $@ $< +memprint.o: memprint.c memprint.h + $(CC) $(CFLAGS) -c -o $@ $< #------------------- -- cgit v1.2.3