From d642c5b1b052b0a372c671474ddce8b9ef85e1d0 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sun, 8 May 2011 04:28:45 +0000
Subject: [PATCH] - Fixed: Building with NOASM defined no longer worked,
 because the DrawSlab routines in a.asm conflicted with the ones in
 r_draw.cpp.

SVN r3194 (trunk)
---
 src/asm_ia32/a.asm | 16 ++++++++--------
 src/r_draw.cpp     |  4 ++--
 src/r_draw.h       |  8 ++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/asm_ia32/a.asm b/src/asm_ia32/a.asm
index eaf747455..b4bc529f6 100644
--- a/src/asm_ia32/a.asm
+++ b/src/asm_ia32/a.asm
@@ -29,8 +29,8 @@
 %define mvlineasm1		_mvlineasm1
 %define mvlineasm4		_mvlineasm4
 
-%define R_SetupDrawSlab	_R_SetupDrawSlab
-%define R_DrawSlab		_R_DrawSlab
+%define R_SetupDrawSlabA _R_SetupDrawSlabA
+%define R_DrawSlabA		 _R_DrawSlabA
 %endif
 
 EXTERN ylookup ; near
@@ -79,11 +79,11 @@ lastslabcolormap:
 	
 	SECTION .text
 
-GLOBAL R_SetupDrawSlab
-GLOBAL @R_SetupDrawSlab@4
-R_SetupDrawSlab:
+GLOBAL R_SetupDrawSlabA
+GLOBAL @R_SetupDrawSlabA@4
+R_SetupDrawSlabA:
 	mov ecx, [esp+4]
-@R_SetupDrawSlab@4:
+@R_SetupDrawSlabA@4:
 	cmp [lastslabcolormap], ecx
 	je .done
 	mov [lastslabcolormap], ecx
@@ -591,8 +591,8 @@ align 16
 ;***************************** Voxel Slabs *******************************
 ;*************************************************************************
 
-GLOBAL R_DrawSlab
-R_DrawSlab:
+GLOBAL R_DrawSlabA
+R_DrawSlabA:
 	push ebx
 	push ebp
 	push esi
diff --git a/src/r_draw.cpp b/src/r_draw.cpp
index 36c87fa89..bbf16b3b3 100644
--- a/src/r_draw.cpp
+++ b/src/r_draw.cpp
@@ -1363,12 +1363,12 @@ void R_FillSpan (void)
 #ifndef X86_ASM
 static const BYTE *slabcolormap;
 
-extern "C" void R_SetupDrawSlab(const BYTE *colormap)
+extern "C" void R_SetupDrawSlabC(const BYTE *colormap)
 {
 	slabcolormap = colormap;
 }
 
-extern "C" void STACK_ARGS R_DrawSlab(int dx, fixed_t v, int dy, fixed_t vi, const BYTE *vptr, BYTE *p)
+extern "C" void STACK_ARGS R_DrawSlabC(int dx, fixed_t v, int dy, fixed_t vi, const BYTE *vptr, BYTE *p)
 {
 	int x;
 	const BYTE *colormap = slabcolormap;
diff --git a/src/r_draw.h b/src/r_draw.h
index 57dfd8712..0f678776d 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -216,6 +216,14 @@ void	R_FillColumnP (void);
 void	R_FillColumnHorizP (void);
 void	R_FillSpan (void);
 
+#ifdef X86_ASM
+#define R_SetupDrawSlab R_SetupDrawSlabA
+#define R_DrawSlab R_DrawSlabA
+#else
+#define R_SetupDrawSlab R_SetupDrawSlabC
+#define R_DrawSlab R_DrawSlabC
+#endif
+
 extern "C" void			   R_SetupDrawSlab(const BYTE *colormap);
 extern "C" void STACK_ARGS R_DrawSlab(int dx, fixed_t v, int dy, fixed_t vi, const BYTE *vptr, BYTE *p);