diff options
| author | Michal Idziorek <m.i@gmx.at> | 2015-05-16 03:48:35 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2015-05-16 03:48:35 +0200 |
| commit | f92a23a2fcee6cbb97af9c7681e6872374d3c789 (patch) | |
| tree | 41669345c8a5a60548e8e07cf805df9ef01c1c26 /Makefile | |
| parent | ba10657752ba869b1c46c861cbda689b535e8214 (diff) | |
finally working ring 3
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -24,6 +24,7 @@ USB_STICK=/dev/sdf #use our cross compiler CC=i686-foolos-gcc +AS=i686-foolos-as ############ compiler flags ############ CFLAGS= @@ -32,7 +33,7 @@ CFLAGS= ## CFLAGS+=-w CFLAGS+=-ffreestanding CFLATS+=-Wall -CFLAGS+=-Wextra +CFLAGS+=-Wextra #CFLAGS+=-O3 #CFLAGS+=-O0 #CFLAGS+=-nostdlib @@ -50,6 +51,10 @@ LDFLAGS= LDFLAGS+=-nostdlib LDFLAGS+=-lgcc +ASFLAGS= +ASFLAGS+=-gstabs + + #verbosity #V = 0 #CC = @echo "Compiling $<..."; i686-foolos-gcc @@ -86,11 +91,12 @@ ASM_MULTIBOOT_OBJ=$(patsubst %.s, %.o, $(ASM_MULTIBOOT)) all: $(FOOLOS) tags # $(FOOLOS_VDI) new: clean all -run: run-qemu-debug +run: run-qemu +debug: run-qemu-debug newrun: clean run -########### INCLUDES ################### +########## INCLUDES ################### include Makefile.common -include $(DEPS) @@ -153,12 +159,13 @@ run-bochs: all ~/opt/bochs-2.6.6/bochs -q -f bochs/bochsrc -rc bochs/bochsdebug # run in qemu -run-qemu: all - qemu -enable-kvm $(FOOLOS) +run-qemu: + qemu -enable-kvm disk.img -s -run-qemu-debug: all +run-qemu-debug: # qemu -enable-kvm -s -S ~/temp/FoolOs/disk.img - qemu -enable-kvm -s -singlestep disk.img +# qemu -enable-kvm -s -singlestep disk.img + qemu -enable-kvm -s -S -kernel foolos.img # -initrd ext2.img stop: killall qemu |