diff options
| author | Michal Idziorek <m.i@gmx.at> | 2015-05-13 04:52:17 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2015-05-13 04:52:17 +0200 |
| commit | 39d0c5ad74f69ef368d6f83e4eac575e76060eb4 (patch) | |
| tree | e38dacc3b42767e8c5d49fda58e26adfe4bdcfa3 /Makefile | |
| parent | d7c12c5210ed1545549b9d2b14fb9fb89ce652e2 (diff) | |
passing grub modules to kernel
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -85,7 +85,7 @@ ASM_MULTIBOOT_OBJ=$(patsubst %.s, %.o, $(ASM_MULTIBOOT)) ############ Final Targets ############ -all: $(FOOLOS) #$(FOOLOS_VDI) +all: $(FOOLOS) $(FOOLOS_VDI) new: clean all run: run-qemu-debug newrun: clean run @@ -151,7 +151,8 @@ $(FOOLOS): $(KERNEL_IMG) # $(SUBDIRS) # vdi image for VirtualBox $(FOOLOS_VDI): $(FOOLOS) -rm FoolOS.vdi - VBoxManage convertfromraw $< $@ --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c + #VBoxManage convertfromraw $< $@ --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c + VBoxManage convertfromraw ~/temp/FoolOs/disk.img $@ --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c # run in our local bochs (we need cirrus support for our vesa mode) run-bochs: all |