lots and lots of userspace stuff

1 files changed, 5 insertions, 9 deletions

diff --git a/euler/makefile b/euler/makefile
index 1767d75..62716f6 100644
--- a/euler/makefile
+++ b/euler/makefile
@@ -1,7 +1,6 @@
-LIBSTDCPP_SOURCES = euler/stream.cpp strings/strlen.cpp euler/syscall.asm \
-  euler/entry.cpp io/fopen.cpp euler/gcc.asm memory/delete.cpp euler/heap.cpp \
-  memory/new.cpp io/fclose.cpp io/fread.cpp strings/memcpy.cpp io/fseek.cpp \
-  euler/start_process.cpp
+LIBC_SOURCES = \
+  entry.cpp std/string.cpp std/cstring.cpp syscall.cpp std/cstdlib.cpp \
+  heap.cpp syscall.asm std/cctype.cpp std/cstdio.cpp stream.cpp
 
 clean:
 	rm -rf build
@@ -12,12 +11,12 @@ build/%.asm.o: source/%.asm
 
 build/%.cpp.o: source/%.cpp
 	@mkdir -p $(@D)
-	$(HILBERT_CC) -c $^ -o $@
+	$(HILBERT_CC) -ffreestanding -c $^ -o $@
 
 build/crt0.o: build/empty.asm.o
 	cp $^ $@
 
-build/libc.a: build/empty.asm.o
+build/libc.a: ${LIBC_SOURCES:%=build/%.o}
 	$(HILBERT_AR) rcs $@ $^
 
 build/libg.a: build/empty.asm.o
@@ -25,6 +24,3 @@ build/libg.a: build/empty.asm.o
 
 build/libm.a: build/empty.asm.o
 	$(HILBERT_AR) rcs $@ $^
-
-build/libstdc++.a: ${LIBSTDCPP_SOURCES:%=build/%.o}
-	$(HILBERT_AR) rcs $@ $^