summaryrefslogtreecommitdiff
path: root/userspace/Makefile
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-08-17 02:28:02 +0200
committerMiguel <m.i@gmx.at>2018-08-17 02:28:02 +0200
commitc742be9c738c91703a7be787639cad167de3a6b1 (patch)
treedb0e170dab1b7f34630489d0cb1d396c92f15c79 /userspace/Makefile
parent559eea53ecdd1e3e45f24d15e8739419b0cd647a (diff)
started reviving my fool os
Diffstat (limited to 'userspace/Makefile')
-rw-r--r--userspace/Makefile20
1 files changed, 11 insertions, 9 deletions
diff --git a/userspace/Makefile b/userspace/Makefile
index 49d93a0..62bc857 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -1,21 +1,24 @@
CC=i686-foolos-gcc
+CC=i686-elf-gcc
CFLAGS=
CFLAGS+=-I..
+CFLAGS+=-I/home/miguel/foolos/usr/i686-foolos/include
CFLAGS+=-w
CFLAGS+=-std=gnu11
CFLAGS+=-O0
CFLAGS+=-g
#CFLAGS+=-fstack-protector-all
-LDFLAGS=
+#LDFLAGS=-nostdlib
+LDFLAGS=-L/home/miguel/foolos/usr/i686-foolos/lib/ -lc -lm -lg -lnosys
PROGS=foolshell ls simple brainfuck add checker clear task1 task2 init cat snake
include ../Makefile.common
-ext2.img: $(PROGS) ../mp/mp.bin
+ext2.img: crt0.o $(PROGS) ../mp/mp.bin
dd if=/dev/zero of=ext2.img bs=512 count=50000
sudo mkfs.ext2 -O none ext2.img -F
mkdir mnt
@@ -30,12 +33,12 @@ ext2.img: $(PROGS) ../mp/mp.bin
# cp ~/temp/fool-os-stuff/binutils-build-host-foolos/binutils/readelf mnt/bin
# cp ../font/binfont.bin mnt/
# cp ~/temp/fool-os-stuff/ncurses/ncurses-5.9-build/progs/* mnt/bin/
- cp ~/opt/foolos/usr/bin/worm mnt/bin/
- cp ~/opt/foolos/usr/bin/dots mnt/bin/
- cp ~/opt/foolos/usr/bin/background mnt/bin/
- cp ~/opt/foolos/usr/bin/view mnt/bin/
- cp ~/opt/foolos/usr/bin/ncurses mnt/bin/
- cp ~/opt/foolos/usr/bin/bs mnt/bin/
+# cp ~/opt/foolos/usr/bin/worm mnt/bin/
+# cp ~/opt/foolos/usr/bin/dots mnt/bin/
+# cp ~/opt/foolos/usr/bin/background mnt/bin/
+# cp ~/opt/foolos/usr/bin/view mnt/bin/
+# cp ~/opt/foolos/usr/bin/ncurses mnt/bin/
+# cp ~/opt/foolos/usr/bin/bs mnt/bin/
cp ../mp/mp.bin mnt/boot/
mkdir -p mnt/etc
echo "127.0.0.1 localhost" > mnt/etc/hosts
@@ -48,7 +51,6 @@ snake: snake.o
foolshell: foolshell.o
simple: simple.o
add: add.o
- $(CC) -o $@ $< -lm
checker: checker.o
task1: task1.o
task2: task2.o