Index: code/unix/unix_shared.c
===================================================================
--- code/unix/unix_shared.c	(revision 470)
+++ code/unix/unix_shared.c	(working copy)
@@ -139,7 +139,8 @@
 #endif
 
 //#if 0 // bk001215 - see snapvector.nasm for replacement
-#if !id386 // rcg010206 - using this for PPC builds...
+// !!! FIXME: Intel Mac assembler is failing...fix that and don't use this!
+#if MACOS_X || !id386
 long fastftol( float f ) { // bk001213 - from win32/win_shared.c
   //static int tmp;
   //	__asm fld f
Index: code/unix/Makefile
===================================================================
--- code/unix/Makefile	(revision 470)
+++ code/unix/Makefile	(working copy)
@@ -313,6 +313,7 @@
   # -framework OpenAL requires 10.4 or later...for builds shipping to the
   #  public, you'll want to use USE_OPENAL_DLOPEN and ship your own OpenAL
   #  library (http://openal.org/ or http://icculus.org/al_osx/)
+  # The Intel Macs are guaranteed to have the AL framework.
   ifeq ($(USE_OPENAL),1)
     ifneq ($(USE_OPENAL_DLOPEN),1)
       CLIENT_LDFLAGS += -framework OpenAL
@@ -853,20 +854,25 @@
   $(B)/client/tr_world.o \
 
 ifeq ($(ARCH),i386)
+ ifneq ($(PLATFORM),darwin)
   Q3OBJ += $(B)/client/vm_x86.o
   Q3OBJ += \
     $(B)/client/snd_mixa.o \
     $(B)/client/matha.o \
     $(B)/client/ftola.o \
     $(B)/client/snapvectora.o
+ endif
 endif
+
 ifeq ($(ARCH),x86)
+ ifneq ($(PLATFORM),darwin)
   Q3OBJ += $(B)/client/vm_x86.o
   Q3OBJ += \
     $(B)/client/snd_mixa.o \
     $(B)/client/matha.o \
     $(B)/client/ftola.o \
     $(B)/client/snapvectora.o
+ endif
 endif
 ifeq ($(ARCH),x86_64)
   Q3OBJ += $(B)/client/vm_x86_64.o
@@ -1197,8 +1203,10 @@
   $(B)/ded/null_snddma.o
 
 ifeq ($(ARCH),i386)
+ ifneq ($(PLATFORM),darwin)
   Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o \
       $(B)/ded/snapvectora.o $(B)/ded/matha.o
+ endif
 endif
 
 ifeq ($(ARCH),x86_64)
Index: code/tools/lcc/cpp/unix.c
===================================================================
--- code/tools/lcc/cpp/unix.c	(revision 470)
+++ code/tools/lcc/cpp/unix.c	(working copy)
@@ -90,6 +90,7 @@
 	return dp;
 }
 
+#if !MACOS_X
 /* memmove is defined here because some vendors don't provide it at
    all and others do a terrible job (like calling malloc) */
 // -- ouch, that hurts -- ln
@@ -118,3 +119,4 @@
 	}
 	return 0;
 }
+#endif
Index: code/qcommon/q_math.c
===================================================================
--- code/qcommon/q_math.c	(revision 470)
+++ code/qcommon/q_math.c	(working copy)
@@ -686,8 +686,8 @@
 ==================
 */
 
-#if !id386
-
+// !!! FIXME: Intel Mac assembler is failing...fix that and don't use this!
+#if MACOS_X || !id386
 int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
 {
 	float	dist1, dist2;
Index: code/qcommon/vm_x86.c
===================================================================
--- code/qcommon/vm_x86.c	(revision 470)
+++ code/qcommon/vm_x86.c	(working copy)
@@ -1174,13 +1174,13 @@
 		memOpStack      = opStack;     
 		memEntryPoint   = entryPoint;  
 		
-		__asm__("	pushal				\r\n" \
-				"	movl %0,%%esi		\r\n" \
-				"	movl %1,%%edi		\r\n" \
-				"	call *%2			\r\n" \
-				"	movl %%esi,%0		\r\n" \
-				"	movl %%edi,%1		\r\n" \
-				"	popal				\r\n" \
+		__asm__("	pushal				\n\t" \
+				"	movl %0,%%esi		\n\t" \
+				"	movl %1,%%edi		\n\t" \
+				"	call *%2			\n\t" \
+				"	movl %%esi,%0		\n\t" \
+				"	movl %%edi,%1		\n\t" \
+				"	popal				\n\t" \
 				: "=m" (memProgramStack), "=m" (memOpStack) \
 				: "m" (memEntryPoint), "m" (memProgramStack), "m" (memOpStack) \
 				: "si", "di" \
Index: code/client/snd_mix.c
===================================================================
--- code/client/snd_mix.c	(revision 470)
+++ code/client/snd_mix.c	(working copy)
@@ -35,8 +35,10 @@
 int      snd_linear_count;
 short*   snd_out;
 
-#if	!id386                                        // if configured not to use asm
 
+// !!! FIXME: Intel Mac assembler is failing...fix that and don't use this!
+#if	MACOS_X || !id386                                        // if configured not to use asm
+
 void S_WriteLinearBlastStereo16 (void)
 {
 	int		i;