diff options
| author | Michal Idziorek <m.i@gmx.at> | 2015-05-13 23:58:39 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2015-05-13 23:58:39 +0200 |
| commit | b74c5c8fb4de3b2847bc942e57dcf8f0dea705be (patch) | |
| tree | fa0a9001cffa64c9193689066bf296dc3df7f844 /Makefile | |
| parent | 9a60edf72a3112adae4a914134da1adaf472ad5d (diff) | |
fixed libc and 'userspace'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -19,13 +19,13 @@ FOOLOS=FoolOS.img FOOLOS_VDI=FoolOS.vdi #submodules -SUBDIRS=boot1 boot2 font userspace +SUBDIRS=font userspace #take care to set this properly! USB_STICK=/dev/sdf #use our cross compiler -CC=i686-elf-gcc +CC=i686-foolos-gcc ############ compiler flags ############ CFLAGS= @@ -85,7 +85,7 @@ ASM_MULTIBOOT_OBJ=$(patsubst %.s, %.o, $(ASM_MULTIBOOT)) ############ Final Targets ############ -all: $(FOOLOS) $(FOOLOS_VDI) +all: $(FOOLOS) tags # $(FOOLOS_VDI) new: clean all run: run-qemu-debug newrun: clean run @@ -134,8 +134,9 @@ $(KERNEL_IMG): $(ASM_MULTIBOOT_OBJ) $(ASM_OBJECTS) $(OBJECTS) ############ assembling of final image ############ # master boot record, kernel binary and fool-font -$(FOOLOS): $(KERNEL_IMG) # $(SUBDIRS) +$(FOOLOS): $(KERNEL_IMG) $(SUBDIRS) sudo cp $(KERNEL_IMG) /mnt/vdi/boot + sudo cp $(IMG_USERSPACE) /mnt/vdi/boot sync # dd if=$(BIN_MBR) of=$@ bs=512 seek=0 conv=notrunc |