Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikeyusc
mikeyusc committed Jun 7, 2015
1 parent 3e73455 commit 2c128fb
Show file tree
Hide file tree
Showing 39 changed files with 4,942 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ C_COMPILER=i686-elf-gcc
ASM_COMPILER=nasm
LINKER=i686-elf-ld

CFLAGS=-I./src/include -std=gnu99 -fleading-underscore -O -ffreestanding -finline-functions-called-once -nostdlib
CFLAGS=-I./src/include -std=gnu99 -fleading-underscore -O -ffreestanding -finline-functions-called-once -nostdlib -Werror=implicit-function-declaration
LDFLAGS=-T./src/link.ld
ASFLAGS=-felf -I$(CURDIR)/src/

Expand Down
3 changes: 2 additions & 1 deletion mactest.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# ScorchOS Testing Script (Linux) - Requires Qemu (and additional kvm-pxe in Ubuntu Lucid)
# Copyright (C) 2008-2011 ScorchOS Developers
# For Terms see license.txt
#VBoxManage startvm "Test OS"

qemu-system-i386 -fda disk_images/scorch.img -m 256
sudo qemu-system-i386 -fda disk_images/scorch.img -m 256 -monitor stdio -netdev tap,id=mynet0,script=tap-up,downscript=tap-down -net nic,model=rtl8139,netdev=mynet0 -usb -device ahci,id=ahci0 -drive if=none,file=/Users/mike/ScorchOS/disk_images/hd.raw,format=raw,id=drive-sata0-0-0 -device ide-drive,bus=ahci0.0,drive=drive-sata0-0-0,id=sata0-0-0 -boot order=ac
Loading

0 comments on commit 2c128fb

Please sign in to comment.