Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[build] Use yasm instead of nasm

This commit is contained in:
Kevin Lange 2011-02-21 13:21:28 -06:00
parent f3f854cc18
commit a86253784f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ toaruos-initrd
bootloader/stage1.bin
bootloader/stage2.bin
initrd/boot
.gdb_history

7
Makefile
View File

@ -3,7 +3,6 @@ CC = clang
GCC = gcc
CFLAGS = -Wall -Wextra -pedantic -m32 -O0 -std=c99 -finline-functions -fno-stack-protector -nostdinc -ffreestanding -Wno-unused-function -Wno-unused-parameter
LD = ld -m elf_i386
NASM = nasm
YASM = yasm
ECHO = `which echo` -e
MODULES = $(patsubst %.c,%.o,$(wildcard kernel/core/*.c))
@ -34,9 +33,9 @@ toaruos-kernel: kernel/start.o kernel/link.ld kernel/main.o ${MODULES} ${FILESYS
@${ECHO} "\r\033[32;1m LD $<\033[0m"
kernel/start.o: kernel/start.asm
@${ECHO} -n "\033[32m nasm $<\033[0m"
@${NASM} -f elf -o kernel/start.o kernel/start.asm
@${ECHO} "\r\033[32;1m nasm $<\033[0m"
@${ECHO} -n "\033[32m yasm $<\033[0m"
@${YASM} -f elf -o kernel/start.o kernel/start.asm
@${ECHO} "\r\033[32;1m yasm $<\033[0m"
%.o: %.c
@${ECHO} -n "\033[32m CC $<\033[0m"