From 1c258c3d59b6bea12c28dd50b914bc43ac1a4763 Mon Sep 17 00:00:00 2001
From: David McPaul <dlmcpaul@gmail.com>
Date: Fri, 10 Apr 2009 03:21:06 +0000
Subject: [PATCH] use yasm instead of nasm

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30096 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage     | 1 +
 build/jam/MainBuildRules | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index dec8303c6e..01a3166c41 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -110,6 +110,7 @@ SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
 	mp3_decoder mp3_reader
 	mp4_reader musepack
 	ogg raw_decoder speex
+	$(X86_ONLY)APE_reader
 	# theora
 	vorbis wav_reader
 ;
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 3f61d128a4..05453212d0 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -174,7 +174,7 @@ rule AssembleNasm
 
 actions AssembleNasm
 {
-	nasm -d $(ASFLAGS) -f elf -o $(1) $(2)
+	yasm -d $(ASFLAGS) -f elf -o $(1) $(2)
 }
 
 rule Ld