diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-10-20 18:54:18 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-10-20 18:54:18 +0200 |
| commit | 813272cd88cc6c0a1dfbb121d2130fc849042c8a (patch) | |
| tree | 61b8ede4a5c191c491621f0185d3a442ff5407dd /Makefile | |
| parent | 2f6fe94d436347c4d886407dbfd44b6ac1aa41fa (diff) | |
1st userspace programm and partial newlib support!
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -105,9 +105,10 @@ FoolOS.img: $(MBR) $(STAGE2) kernel.bin $(FILLUP) FoolData.img binfont.img: binfont.bin cat $^ > $@ -FoolData.img: binfont.bin $(MP_BIN) +FoolData.img: binfont.bin $(MP_BIN) userspace/userprog dd if=$(MP_BIN) of=$@ bs=512 seek=0 conv=notrunc dd if=binfont.bin of=$@ bs=512 seek=1 conv=notrunc + dd if=userspace/userprog of=$@ bs=512 seek=4 conv=notrunc ############ vm stuff ############ @@ -121,10 +122,15 @@ run: all clean: -rm *.bin *.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2) + make -C userspace clean + release: all -rm *.bin FoolData.img binfont.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2) +userspace/userprog: + make -C userspace + ############ test stuff ############ stick: FoolOS.img |