From c83cb15ede6d557551533cc70fc90103da6d3b6d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 17 May 2000 11:57:35 +0000
Subject: [PATCH] id386 -> USE_INTEL_ASM conversion better
 HAVE_SYM_PREFIX_UNDERSCORE checking

---
 configure.in         |  22 ++++-----
 include/bothdefs.h   |   2 +-
 include/d_local.h    |   2 +-
 include/r_local.h    |   2 +-
 source/cl_math.S     |   7 ++-
 source/d_copy.S      |   3 ++
 source/d_draw.S      |   7 ++-
 source/d_draw16.S    |   7 ++-
 source/d_init.c      |   2 +-
 source/d_modech.c    |   4 +-
 source/d_part.c      |   4 +-
 source/d_parta.S     |   7 ++-
 source/d_polysa.S    |   7 ++-
 source/d_polyse.c    |  30 ++++++-------
 source/d_scan.c      |   8 ++--
 source/d_scana.S     |   7 ++-
 source/d_spr8.S      |   7 ++-
 source/d_sprite.c    |   2 +-
 source/d_vars.c      |   4 +-
 source/d_varsa.S     |   7 ++-
 source/math.S        |   7 ++-
 source/mathlib.c     |   4 +-
 source/nonintel.c    |   4 +-
 source/qw_client.dsp | 104 +++++++++++++++++++++----------------------
 source/qw_server.dsp |  12 ++---
 source/r_aclip.c     |   2 +-
 source/r_aclipa.S    |   7 ++-
 source/r_alias.c     |   4 +-
 source/r_aliasa.S    |   7 ++-
 source/r_draw.c      |   4 +-
 source/r_drawa.S     |   7 ++-
 source/r_edge.c      |  16 +++----
 source/r_edgea.S     |   7 ++-
 source/r_main.c      |   8 ++--
 source/r_misc.c      |   2 +-
 source/r_surf.c      |   2 +-
 source/r_vars.c      |   4 +-
 source/r_varsa.S     |   7 ++-
 source/snd_mix.c     |   6 +--
 source/snd_mixa.S    |   7 ++-
 source/surf16.S      |   7 ++-
 source/surf8.S       |   7 ++-
 source/sys_linux.c   |   4 +-
 source/sys_x86.S     |  51 +++++++++++----------
 source/world.c       |   4 +-
 source/worlda.S      |   7 ++-
 46 files changed, 249 insertions(+), 193 deletions(-)

diff --git a/configure.in b/configure.in
index 0acd63e..7b32e43 100644
--- a/configure.in
+++ b/configure.in
@@ -83,6 +83,15 @@ AC_TRY_COMPILE(
 	)
 )
 
+AC_MSG_CHECKING(for underscore prefix in names)
+AC_TRY_LINK(
+	[asm(".long _bar");
+	int bar;],
+	[],
+	AC_DEFINE(HAVE_SYM_PREFIX_UNDERSCORE) AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no)
+)
+
 AC_MSG_CHECKING(for size_t in sys/types.h)
 AC_TRY_COMPILE(
 	[#include <sys/types.h>],
@@ -119,19 +128,6 @@ AC_TRY_COMPILE(
 	AC_MSG_RESULT(no)
 )
 
-dnl Check for symbol underscore prefix 
-dnl !!! FIXME !!! Do some real check here...
-AC_MSG_CHECKING(whether C symbols are prefixed by '_')
-case "${target}" in
-  *-*-msdos* | *-*-djgpp* | *-*-mingw* | *-*-cygwin* | *-*-openbsd*)
-	AC_DEFINE(HAVE_SYM_PREFIX_UNDERSCORE)
-        AC_MSG_RESULT(yes)
-	;;
-  *)
-        AC_MSG_RESULT(no)
-	;;
-esac
-
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
diff --git a/include/bothdefs.h b/include/bothdefs.h
index 14aba9d..0f9300d 100644
--- a/include/bothdefs.h
+++ b/include/bothdefs.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define QF_VERSION	"newtree test build"
 
 
-#if id386
+#if USE_INTEL_ASM
 #define UNALIGNED_OK	1	// set to 0 if unaligned accesses are not supported
 #else
 #define UNALIGNED_OK	0
diff --git a/include/d_local.h b/include/d_local.h
index f8126b2..7e14c43 100644
--- a/include/d_local.h
+++ b/include/d_local.h
@@ -87,7 +87,7 @@ surfcache_t	*D_CacheSurface (msurface_t *surface, int miplevel);
 
 extern int D_MipLevelForScale (float scale);
 
-#if id386
+#if USE_INTEL_ASM
 extern void D_PolysetAff8Start (void);
 extern void D_PolysetAff8End (void);
 #endif
diff --git a/include/r_local.h b/include/r_local.h
index 29fc16f..173239d 100644
--- a/include/r_local.h
+++ b/include/r_local.h
@@ -177,7 +177,7 @@ void R_DrawSurfaceBlock16 (void);
 void R_DrawSurfaceBlock8 (void);
 texture_t *R_TextureAnimation (texture_t *base);
 
-#if	id386
+#if	USE_INTEL_ASM
 
 void R_DrawSurfaceBlock8_mip0 (void);
 void R_DrawSurfaceBlock8_mip1 (void);
diff --git a/source/cl_math.S b/source/cl_math.S
index 4f855ef..8ede845 100644
--- a/source/cl_math.S
+++ b/source/cl_math.S
@@ -28,11 +28,14 @@
 // math.s
 // x86 assembly-language math routines.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 
 
-#if	id386
+#if	USE_INTEL_ASM
 
 	.data
 
@@ -106,4 +109,4 @@ C(TransformVector):
 	ret
 
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/d_copy.S b/source/d_copy.S
index 58f4dd3..80aed2a 100644
--- a/source/d_copy.S
+++ b/source/d_copy.S
@@ -28,6 +28,9 @@
 // d_copy.s
 // x86 assembly-language screen copying code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
diff --git a/source/d_draw.S b/source/d_draw.S
index 04db484..445039e 100644
--- a/source/d_draw.S
+++ b/source/d_draw.S
@@ -28,12 +28,15 @@
 // d_draw.s
 // x86 assembly-language horizontal 8-bpp span-drawing code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 //----------------------------------------------------------------------
 // 8-bpp horizontal span drawing code for polygons, with no transparency.
@@ -1040,4 +1043,4 @@ LFDone:
 	popl	%ebp				// restore the caller's stack frame
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/d_draw16.S b/source/d_draw16.S
index 8e901cc..610b8f4 100644
--- a/source/d_draw16.S
+++ b/source/d_draw16.S
@@ -29,12 +29,15 @@
 // x86 assembly-language horizontal 8-bpp span-drawing code, with 16-pixel
 // subdivision.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 //----------------------------------------------------------------------
 // 8-bpp horizontal span drawing code for polygons, with no transparency and
@@ -977,4 +980,4 @@ LEndSpan:
 	popl	%ebp				// restore the caller's stack frame
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/d_init.c b/source/d_init.c
index dd76632..1c35439 100644
--- a/source/d_init.c
+++ b/source/d_init.c
@@ -173,7 +173,7 @@ void D_SetupFrame (void)
  CVAR_FIXME */
 		d_scalemip[i] = basemip[i] * d_mipscale->value;
 
-#if	id386
+#if	USE_INTEL_ASM
 /* 				if (d_subdiv16.value)
  CVAR_FIXME */
 				if (d_subdiv16->value)
diff --git a/source/d_modech.c b/source/d_modech.c
index 863884b..db86f73 100644
--- a/source/d_modech.c
+++ b/source/d_modech.c
@@ -48,7 +48,7 @@ D_Patch
 */
 void D_Patch (void)
 {
-#if id386
+#if USE_INTEL_ASM
 
 	static qboolean protectset8 = false;
 
@@ -59,7 +59,7 @@ void D_Patch (void)
 		protectset8 = true;
 	}
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 }
 
 
diff --git a/source/d_part.c b/source/d_part.c
index 67c4474..20436df 100644
--- a/source/d_part.c
+++ b/source/d_part.c
@@ -56,7 +56,7 @@ void D_StartParticles (void)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ==============
@@ -214,5 +214,5 @@ void D_DrawParticle (particle_t *pparticle)
 	}
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
diff --git a/source/d_parta.S b/source/d_parta.S
index cfaadf6..a7e7957 100644
--- a/source/d_parta.S
+++ b/source/d_parta.S
@@ -28,12 +28,15 @@
 // d_parta.s
 // x86 assembly-language 8-bpp particle-drawing code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "d_ifacea.h"
 #include "asm_draw.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 //----------------------------------------------------------------------
 // 8-bpp particle drawing code.
@@ -480,4 +483,4 @@ LPop1AndDone:
 	fstp	%st(0)
 	jmp		LDone
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/d_polysa.S b/source/d_polysa.S
index 179bacc..2474305 100644
--- a/source/d_polysa.S
+++ b/source/d_polysa.S
@@ -28,12 +28,15 @@
 // d_polysa.s
 // x86 assembly-language polygon model drawing code
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 // !!! if this is changed, it must be changed in d_polyse.c too !!!
 #define DPS_MAXSPANS			MAXHEIGHT+1	
@@ -1746,5 +1749,5 @@ LNextTri:
 	ret
 
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/d_polyse.c b/source/d_polyse.c
index d6144e2..5eca0aa 100644
--- a/source/d_polyse.c
+++ b/source/d_polyse.c
@@ -126,7 +126,7 @@ void D_PolysetSetEdgeTable (void);
 void D_RasterizeAliasPolySmooth (void);
 void D_PolysetScanLeftEdge (int height);
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ================
@@ -397,7 +397,7 @@ nodraw:
 	D_PolysetRecursiveTriangle (lp3, new, lp2);
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 /*
@@ -422,7 +422,7 @@ void D_PolysetUpdateTables (void)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ===================
@@ -490,7 +490,7 @@ void D_PolysetScanLeftEdge (int height)
 	} while (--height);
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 /*
@@ -532,7 +532,7 @@ void D_PolysetSetUpForLineScan(fixed8_t startvertu, fixed8_t startvertv,
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ================
@@ -584,7 +584,7 @@ void D_PolysetCalcGradients (int skinwidth)
 	r_zistepy = (int)((t1 * p00_minus_p20 - t0 * p10_minus_p20) *
 			ystepdenominv);
 
-#if	id386
+#if	USE_INTEL_ASM
 	a_sstepxfrac = r_sstepx << 16;
 	a_tstepxfrac = r_tstepx << 16;
 #else
@@ -595,7 +595,7 @@ void D_PolysetCalcGradients (int skinwidth)
 	a_ststepxwhole = skinwidth * (r_tstepx >> 16) + (r_sstepx >> 16);
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 byte gelmap[256];
@@ -613,7 +613,7 @@ void InitGel (byte *palette)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ================
@@ -683,7 +683,7 @@ void D_PolysetDrawSpans8 (spanpackage_t *pspanpackage)
 		pspanpackage++;
 	} while (pspanpackage->count != -999999);
 }
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 /*
@@ -766,7 +766,7 @@ void D_RasterizeAliasPolySmooth (void)
 
 	d_ptex = (byte *)r_affinetridesc.pskin + (plefttop[2] >> 16) +
 			(plefttop[3] >> 16) * r_affinetridesc.skinwidth;
-#if	id386
+#if	USE_INTEL_ASM
 	d_sfrac = (plefttop[2] & 0xFFFF) << 16;
 	d_tfrac = (plefttop[3] & 0xFFFF) << 16;
 	d_pzbasestep = (d_zwidth + ubasestep) << 1;
@@ -800,7 +800,7 @@ void D_RasterizeAliasPolySmooth (void)
 	d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) +
 			((r_tstepy + r_tstepx * ubasestep) >> 16) *
 			r_affinetridesc.skinwidth;
-#if	id386
+#if	USE_INTEL_ASM
 	d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16;
 	d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16;
 #else
@@ -813,7 +813,7 @@ void D_RasterizeAliasPolySmooth (void)
 	d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) +
 			((r_tstepy + r_tstepx * d_countextrastep) >> 16) *
 			r_affinetridesc.skinwidth;
-#if	id386
+#if	USE_INTEL_ASM
 	d_sfracextrastep = (r_sstepy + r_sstepx*d_countextrastep) << 16;
 	d_tfracextrastep = (r_tstepy + r_tstepx*d_countextrastep) << 16;
 #else
@@ -854,7 +854,7 @@ void D_RasterizeAliasPolySmooth (void)
 		d_pdestbasestep = screenwidth + ubasestep;
 		d_pdestextrastep = d_pdestbasestep + 1;
 		d_pdest = (byte *)d_viewbuffer + ystart * screenwidth + plefttop[0];
-#if	id386
+#if	USE_INTEL_ASM
 		d_pzbasestep = (d_zwidth + ubasestep) << 1;
 		d_pzextrastep = d_pzbasestep + 2;
 #else
@@ -872,7 +872,7 @@ void D_RasterizeAliasPolySmooth (void)
 		d_ptexbasestep = ((r_sstepy + r_sstepx * ubasestep) >> 16) +
 				((r_tstepy + r_tstepx * ubasestep) >> 16) *
 				r_affinetridesc.skinwidth;
-#if	id386
+#if	USE_INTEL_ASM
 		d_sfracbasestep = (r_sstepy + r_sstepx * ubasestep) << 16;
 		d_tfracbasestep = (r_tstepy + r_tstepx * ubasestep) << 16;
 #else
@@ -885,7 +885,7 @@ void D_RasterizeAliasPolySmooth (void)
 		d_ptexextrastep = ((r_sstepy + r_sstepx * d_countextrastep) >> 16) +
 				((r_tstepy + r_tstepx * d_countextrastep) >> 16) *
 				r_affinetridesc.skinwidth;
-#if	id386
+#if	USE_INTEL_ASM
 		d_sfracextrastep = ((r_sstepy+r_sstepx*d_countextrastep) & 0xFFFF)<<16;
 		d_tfracextrastep = ((r_tstepy+r_tstepx*d_countextrastep) & 0xFFFF)<<16;
 #else
diff --git a/source/d_scan.c b/source/d_scan.c
index 3795b64..8b5db1a 100644
--- a/source/d_scan.c
+++ b/source/d_scan.c
@@ -98,7 +98,7 @@ void D_WarpScreen (void)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 =============
@@ -119,7 +119,7 @@ void D_DrawTurbulent8Span (void)
 	} while (--r_turb_spancount > 0);
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 /*
 =============
@@ -254,7 +254,7 @@ void Turbulent8 (espan_t *pspan)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 =============
@@ -392,7 +392,7 @@ void D_DrawSpans8 (espan_t *pspan)
 #endif
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 =============
diff --git a/source/d_scana.S b/source/d_scana.S
index 824abab..31f47ce 100644
--- a/source/d_scana.S
+++ b/source/d_scana.S
@@ -28,12 +28,15 @@
 // d_scana.s
 // x86 assembly-language turbulent texture mapping code
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if id386
+#if USE_INTEL_ASM
 
 	.data
 
@@ -91,5 +94,5 @@ Llp:
 	popl	%ebp				// restore caller's stack frame pointer
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/d_spr8.S b/source/d_spr8.S
index 393c2df..d4c19ef 100644
--- a/source/d_spr8.S
+++ b/source/d_spr8.S
@@ -28,11 +28,14 @@
 // d_spr8.s
 // x86 assembly-language horizontal 8-bpp transparent span-drawing code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#if id386
+#if USE_INTEL_ASM
 
 //----------------------------------------------------------------------
 // 8-bpp horizontal span drawing code for polygons, with transparency.
@@ -903,4 +906,4 @@ LNextSpan:
 	popl	%ebp				// restore the caller's stack frame
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/d_sprite.c b/source/d_sprite.c
index 9ba8a9b..553fa68 100644
--- a/source/d_sprite.c
+++ b/source/d_sprite.c
@@ -38,7 +38,7 @@ static int		sprite_height;
 static int		minindex, maxindex;
 static sspan_t	*sprite_spans;
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 =====================
diff --git a/source/d_vars.c b/source/d_vars.c
index fd250a1..3b994b6 100644
--- a/source/d_vars.c
+++ b/source/d_vars.c
@@ -27,7 +27,7 @@
 */
 // r_vars.c: global refresh variables
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -57,5 +57,5 @@ short			*d_pzbuffer;
 unsigned int	d_zrowbytes;
 unsigned int	d_zwidth;
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
diff --git a/source/d_varsa.S b/source/d_varsa.S
index 2527ca3..81edbc5 100644
--- a/source/d_varsa.S
+++ b/source/d_varsa.S
@@ -26,12 +26,15 @@
 	$Id$
 */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 	.data
 
@@ -214,5 +217,5 @@ entryvec_table:	.long	0, Entry2_8, Entry3_8, Entry4_8
 spr8entryvec_table:	.long	0, Spr8Entry2_8, Spr8Entry3_8, Spr8Entry4_8
 					.long	Spr8Entry5_8, Spr8Entry6_8, Spr8Entry7_8, Spr8Entry8_8
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/math.S b/source/math.S
index e8e66b9..323db6c 100644
--- a/source/math.S
+++ b/source/math.S
@@ -28,11 +28,14 @@
 // math.s
 // x86 assembly-language math routines.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 // #include "quakeasm.h"
 
 
-#if id386
+#if USE_INTEL_ASM
 
 	.data
 
@@ -356,4 +359,4 @@ LSetSides:
 Lerror:
 	call	C(BOPS_Error)
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/mathlib.c b/source/mathlib.c
index 4c8458e..299ac44 100644
--- a/source/mathlib.c
+++ b/source/mathlib.c
@@ -186,7 +186,7 @@ void BOPS_Error (void)
 	Sys_Error ("BoxOnPlaneSide:  Bad signbits");
 }
 
-#if !id386
+#if !USE_INTEL_ASM
 
 /*
 ==================
@@ -570,7 +570,7 @@ int GreatestCommonDivisor (int i1, int i2)
 }
 
 
-#if !id386
+#if !USE_INTEL_ASM
 
 // TODO: move to nonintel.c
 
diff --git a/source/nonintel.c b/source/nonintel.c
index f183e07..bdf9f0a 100644
--- a/source/nonintel.c
+++ b/source/nonintel.c
@@ -32,7 +32,7 @@
 #endif
 #include "quakedef.h"
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ================
@@ -67,5 +67,5 @@ void R_SurfacePatch (void)
 }
 
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
diff --git a/source/qw_client.dsp b/source/qw_client.dsp
index 142479e..c92748e 100644
--- a/source/qw_client.dsp
+++ b/source/qw_client.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "id386" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_INTEL_ASM" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "id386" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_INTEL_ASM" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../scitech/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "id386" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "id386" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../scitech/include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_INTEL_ASM" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_INTEL_ASM" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -124,8 +124,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "../scitech/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "id386" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "id386" /YX /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "../scitech/include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_INTEL_ASM" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "USE_INTEL_ASM" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -1251,7 +1251,7 @@ InputPath=.\cl_math.S
 InputName=cl_math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1266,7 +1266,7 @@ InputPath=.\cl_math.S
 InputName=cl_math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1296,7 +1296,7 @@ InputPath=.\d_draw.S
 InputName=d_draw
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1311,7 +1311,7 @@ InputPath=.\d_draw.S
 InputName=d_draw
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1341,7 +1341,7 @@ InputPath=.\d_draw16.S
 InputName=d_draw16
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1356,7 +1356,7 @@ InputPath=.\d_draw16.S
 InputName=d_draw16
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1386,7 +1386,7 @@ InputPath=.\d_parta.S
 InputName=d_parta
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1401,7 +1401,7 @@ InputPath=.\d_parta.S
 InputName=d_parta
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1431,7 +1431,7 @@ InputPath=.\d_polysa.S
 InputName=d_polysa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1446,7 +1446,7 @@ InputPath=.\d_polysa.S
 InputName=d_polysa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1476,7 +1476,7 @@ InputPath=.\d_scana.S
 InputName=d_scana
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1491,7 +1491,7 @@ InputPath=.\d_scana.S
 InputName=d_scana
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1521,7 +1521,7 @@ InputPath=.\d_spr8.S
 InputName=d_spr8
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1536,7 +1536,7 @@ InputPath=.\d_spr8.S
 InputName=d_spr8
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1566,7 +1566,7 @@ InputPath=.\d_varsa.S
 InputName=d_varsa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1581,7 +1581,7 @@ InputPath=.\d_varsa.S
 InputName=d_varsa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1611,7 +1611,7 @@ InputPath=.\math.S
 InputName=math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1626,7 +1626,7 @@ InputPath=.\math.S
 InputName=math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1641,7 +1641,7 @@ InputPath=.\math.S
 InputName=math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1656,7 +1656,7 @@ InputPath=.\math.S
 InputName=math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1678,7 +1678,7 @@ InputPath=.\r_aclipa.S
 InputName=r_aclipa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1693,7 +1693,7 @@ InputPath=.\r_aclipa.S
 InputName=r_aclipa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1723,7 +1723,7 @@ InputPath=.\r_aliasa.S
 InputName=r_aliasa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1738,7 +1738,7 @@ InputPath=.\r_aliasa.S
 InputName=r_aliasa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1768,7 +1768,7 @@ InputPath=.\r_drawa.S
 InputName=r_drawa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1783,7 +1783,7 @@ InputPath=.\r_drawa.S
 InputName=r_drawa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1813,7 +1813,7 @@ InputPath=.\r_edgea.S
 InputName=r_edgea
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1828,7 +1828,7 @@ InputPath=.\r_edgea.S
 InputName=r_edgea
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1858,7 +1858,7 @@ InputPath=.\r_varsa.S
 InputName=r_varsa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1873,7 +1873,7 @@ InputPath=.\r_varsa.S
 InputName=r_varsa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1903,7 +1903,7 @@ InputPath=.\snd_mixa.S
 InputName=snd_mixa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1918,7 +1918,7 @@ InputPath=.\snd_mixa.S
 InputName=snd_mixa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1933,7 +1933,7 @@ InputPath=.\snd_mixa.S
 InputName=snd_mixa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1948,7 +1948,7 @@ InputPath=.\snd_mixa.S
 InputName=snd_mixa
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1970,7 +1970,7 @@ InputPath=.\surf16.S
 InputName=surf16
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -1985,7 +1985,7 @@ InputPath=.\surf16.S
 InputName=surf16
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2015,7 +2015,7 @@ InputPath=.\surf8.S
 InputName=surf8
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2030,7 +2030,7 @@ InputPath=.\surf8.S
 InputName=surf8
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2060,7 +2060,7 @@ InputPath=.\sys_x86.S
 InputName=sys_x86
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2075,7 +2075,7 @@ InputPath=.\sys_x86.S
 InputName=sys_x86
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2090,7 +2090,7 @@ InputPath=.\sys_x86.S
 InputName=sys_x86
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2105,7 +2105,7 @@ InputPath=.\sys_x86.S
 InputName=sys_x86
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2127,7 +2127,7 @@ InputPath=.\worlda.S
 InputName=worlda
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2142,7 +2142,7 @@ InputPath=.\worlda.S
 InputName=worlda
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2157,7 +2157,7 @@ InputPath=.\worlda.S
 InputName=worlda
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -2172,7 +2172,7 @@ InputPath=.\worlda.S
 InputName=worlda
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
diff --git a/source/qw_server.dsp b/source/qw_server.dsp
index 3612ea0..32d6da3 100644
--- a/source/qw_server.dsp
+++ b/source/qw_server.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "id386" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_INTEL_ASM" /YX /FD /c
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x419 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "id386" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_INTEL_ASM" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x419 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -233,7 +233,7 @@ InputPath=.\math.S
 InputName=math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -248,7 +248,7 @@ InputPath=.\math.S
 InputName=math
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -270,7 +270,7 @@ InputPath=.\worlda.S
 InputName=worlda
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
@@ -285,7 +285,7 @@ InputPath=.\worlda.S
 InputName=worlda
 
 "$(OUTDIR)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	cl /D "id386" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
+	cl /D "USE_INTEL_ASM" /I "..\source" /I "..\include" /I "..\win32" /nologo /EP > $(OUTDIR)\$(InputName).spp $(InputPath) 
 	..\tools\gas2masm\debug\gas2masm < $(OUTDIR)\$(InputName).spp > $(OUTDIR)\$(InputName).asm 
 	ml /nologo /c /Cp /coff /Zi /H64 /Fo$(OUTDIR)\$(InputName).obj $(OUTDIR)\$(InputName).asm 
 	del $(OUTDIR)\$(InputName).spp 
diff --git a/source/r_aclip.c b/source/r_aclip.c
index 95626f1..c4dcb52 100644
--- a/source/r_aclip.c
+++ b/source/r_aclip.c
@@ -103,7 +103,7 @@ void R_Alias_clip_z (finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *out)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 void R_Alias_clip_left (finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *out)
 {
diff --git a/source/r_aclipa.S b/source/r_aclipa.S
index 66adb68..0f29b4e 100644
--- a/source/r_aclipa.S
+++ b/source/r_aclipa.S
@@ -28,12 +28,15 @@
 // r_aliasa.s
 // x86 assembly-language Alias model transform and project code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if id386
+#if USE_INTEL_ASM
 
 	.data
 Ltemp0:	.long	0
@@ -218,5 +221,5 @@ C(R_Alias_clip_left):
 	jmp		LRightLeftEntry
 
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/r_alias.c b/source/r_alias.c
index 053bac7..c4dcb59 100644
--- a/source/r_alias.c
+++ b/source/r_alias.c
@@ -461,7 +461,7 @@ void R_AliasTransformFinalVert (finalvert_t *fv, auxvert_t *av,
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ================
@@ -760,7 +760,7 @@ void R_AliasDrawModel (alight_t *plighting)
 	}
 	else
 	{
-#if id386
+#if USE_INTEL_ASM
 		D_Aff8Patch (currententity->colormap);
 #endif
 	}
diff --git a/source/r_aliasa.S b/source/r_aliasa.S
index 4d65dc4..3d2dc6d 100644
--- a/source/r_aliasa.S
+++ b/source/r_aliasa.S
@@ -28,12 +28,15 @@
 // r_aliasa.s
 // x86 assembly-language Alias model transform and project code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if id386
+#if USE_INTEL_ASM
 
 	.data
 
@@ -239,5 +242,5 @@ Lsavelight:
 	fstp	%st(0)
 	jmp		Lp1
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/r_draw.c b/source/r_draw.c
index d06fb85..f196119 100644
--- a/source/r_draw.c
+++ b/source/r_draw.c
@@ -79,7 +79,7 @@ int				r_ceilv1;
 qboolean	r_lastvertvalid;
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ================
@@ -361,7 +361,7 @@ void R_ClipEdge (mvertex_t *pv0, mvertex_t *pv1, clipplane_t *clip)
 	R_EmitEdge (pv0, pv1);
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 /*
diff --git a/source/r_drawa.S b/source/r_drawa.S
index df8ab82..a094e45 100644
--- a/source/r_drawa.S
+++ b/source/r_drawa.S
@@ -28,12 +28,15 @@
 // r_drawa.s
 // x86 assembly-language edge clipping and emission code
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 // !!! if these are changed, they must be changed in r_draw.c too !!!
 #define FULLY_CLIPPED_CACHED	0x80000000
@@ -840,5 +843,5 @@ LClampP2:
 LClampP3:
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/r_edge.c b/source/r_edge.c
index c4bdfad..e82468f 100644
--- a/source/r_edge.c
+++ b/source/r_edge.c
@@ -170,7 +170,7 @@ void R_BeginEdgeFrame (void)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ==============
@@ -213,10 +213,10 @@ addedge:
 	} while ((edgestoadd = next_edge) != NULL);
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 	
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ==============
@@ -233,10 +233,10 @@ void R_RemoveEdges (edge_t *pedge)
 	} while ((pedge = pedge->nextremove) != NULL);
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ==============
@@ -303,7 +303,7 @@ pushback:
 	}
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 /*
@@ -462,7 +462,7 @@ void R_TrailingEdge (surf_t *surf, edge_t *edge)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ==============
@@ -628,7 +628,7 @@ void R_GenerateSpans (void)
 	R_CleanupSpan ();
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 /*
diff --git a/source/r_edgea.S b/source/r_edgea.S
index ed48b77..7ce594f 100644
--- a/source/r_edgea.S
+++ b/source/r_edgea.S
@@ -28,11 +28,14 @@
 // r_edgea.s
 // x86 assembly-language edge-processing code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 	.data
 Ltemp:					.long	0
@@ -752,5 +755,5 @@ C(R_SurfacePatch):
 
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/r_main.c b/source/r_main.c
index bee9b46..a7f51f6 100644
--- a/source/r_main.c
+++ b/source/r_main.c
@@ -345,10 +345,10 @@ void R_Init (void)
 	R_InitParticles ();
 
 // TODO: collect 386-specific code in one place
-#if	id386
+#if	USE_INTEL_ASM
 	Sys_MakeCodeWriteable ((long)R_EdgeCodeStart,
 					     (long)R_EdgeCodeEnd - (long)R_EdgeCodeStart);
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
 	D_Init ();
 }
@@ -612,7 +612,7 @@ void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect)
 		r_fov_greater_than_90 = true;
 
 // TODO: collect 386-specific code in one place
-#if id386
+#if USE_INTEL_ASM
 	if (r_pixbytes == 1)
 	{
 		Sys_MakeCodeWriteable ((long)R_Surf8Start,
@@ -627,7 +627,7 @@ void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect)
 		colormap = vid.colormap16;
 		R_Surf16Patch ();
 	}
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
 	D_ViewChanged ();
 }
diff --git a/source/r_misc.c b/source/r_misc.c
index be4bb4d..25ea25f 100644
--- a/source/r_misc.c
+++ b/source/r_misc.c
@@ -390,7 +390,7 @@ void R_TransformFrustum (void)
 }
 
 
-#if !id386
+#if !USE_INTEL_ASM
 
 /*
 ================
diff --git a/source/r_surf.c b/source/r_surf.c
index 7b85b28..ec353be 100644
--- a/source/r_surf.c
+++ b/source/r_surf.c
@@ -330,7 +330,7 @@ void R_DrawSurface (void)
 
 //=============================================================================
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ================
diff --git a/source/r_vars.c b/source/r_vars.c
index 34123c1..12dc013 100644
--- a/source/r_vars.c
+++ b/source/r_vars.c
@@ -32,7 +32,7 @@
 #endif
 #include	"quakedef.h"
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 // all global and static refresh variables are collected in a contiguous block
 // to avoid cache conflicts.
@@ -46,5 +46,5 @@
 
 int	r_bmodelactive;
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
diff --git a/source/r_varsa.S b/source/r_varsa.S
index 7a4e06e..1d39e0a 100644
--- a/source/r_varsa.S
+++ b/source/r_varsa.S
@@ -26,12 +26,15 @@
 	$Id$
 */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 #include "d_ifacea.h"
 
-#if id386
+#if USE_INTEL_ASM
 
 	.data
 
@@ -65,5 +68,5 @@ FloatMinus2ToThe31nd:	.long	0xcf000000
 .globl	C(r_bmodelactive)
 C(r_bmodelactive):	.long	0
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/snd_mix.c b/source/snd_mix.c
index 0243adf..2dd75e4 100644
--- a/source/snd_mix.c
+++ b/source/snd_mix.c
@@ -46,7 +46,7 @@ short	*snd_out;
 
 void Snd_WriteLinearBlastStereo16 (void);
 
-#if	!id386
+#if	!USE_INTEL_ASM
 void Snd_WriteLinearBlastStereo16 (void)
 {
 	int		i;
@@ -356,7 +356,7 @@ void SND_InitScaletable (void)
 }
 
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
 {
@@ -384,7 +384,7 @@ void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
 	ch->pos += count;
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
diff --git a/source/snd_mixa.S b/source/snd_mixa.S
index 23caf5c..fa34f76 100644
--- a/source/snd_mixa.S
+++ b/source/snd_mixa.S
@@ -28,10 +28,13 @@
 // snd_mixa.s
 // x86 assembly-language sound code
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 // #include "quakeasm.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 	.text
 
@@ -227,5 +230,5 @@ LClampDone2:
 	ret
 
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
 
diff --git a/source/surf16.S b/source/surf16.S
index 6e5b4c9..b3bd2c4 100644
--- a/source/surf16.S
+++ b/source/surf16.S
@@ -28,11 +28,14 @@
 // surf16.s
 // x86 assembly-language 16 bpp surface block drawing code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#if id386
+#if USE_INTEL_ASM
 
 //----------------------------------------------------------------------
 // Surface block drawer
@@ -175,4 +178,4 @@ LPatchLoop16:
 	ret
 
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/surf8.S b/source/surf8.S
index 41b9f17..f24fe90 100644
--- a/source/surf8.S
+++ b/source/surf8.S
@@ -28,11 +28,14 @@
 // surf8.s
 // x86 assembly-language 8 bpp surface block drawing code.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 #include "quakeasm.h"
 #include "asm_draw.h"
 
-#if	id386
+#if	USE_INTEL_ASM
 
 	.data
 
@@ -786,4 +789,4 @@ LPatchLoop8:
 
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM
diff --git a/source/sys_linux.c b/source/sys_linux.c
index 8e1f717..77eed2c 100644
--- a/source/sys_linux.c
+++ b/source/sys_linux.c
@@ -183,7 +183,7 @@ void Sys_Quit (void)
 
 void Sys_Init(void)
 {
-#if id386
+#if USE_INTEL_ASM
 	Sys_SetFPCW();
 #endif
 }
@@ -386,7 +386,7 @@ char *Sys_ConsoleInput(void)
 	return NULL;
 }
 
-#if !id386
+#if !USE_INTEL_ASM
 void Sys_HighFPPrecision (void)
 {
 }
diff --git a/source/sys_x86.S b/source/sys_x86.S
index 9a2d908..66b2702 100644
--- a/source/sys_x86.S
+++ b/source/sys_x86.S
@@ -1,30 +1,33 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
+/*
+Copyright (C) 1996-1997 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
 //
 // sys_wina.s
 // x86 assembly-language Win-dependent routines.
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 // #include "quakeasm.h"
-
-//@@@ should be id386-dependent, and have an equivalent C path
+
+//@@@ should be USE_INTEL_ASM-dependent, and have an equivalent C path
 
 	.data
 
@@ -93,19 +96,19 @@ C(Sys_PopFPCW):
 C(Sys_SetFPCW):
 	fnstcw	cw
 	movl	cw,%eax
-#if	id386
+#if	USE_INTEL_ASM
 	andb	$0xF0,%ah
 	orb		$0x03,%ah	// round mode, 64-bit precision
 #endif
 	movl	%eax,full_cw
 
-#if	id386
+#if	USE_INTEL_ASM
 	andb	$0xF0,%ah
 	orb		$0x0C,%ah	// chop mode, single precision
 #endif
 	movl	%eax,single_cw
 
-#if	id386
+#if	USE_INTEL_ASM
 	andb	$0xF0,%ah
 	orb		$0x08,%ah	// ceil mode, single precision
 #endif
diff --git a/source/world.c b/source/world.c
index 3b02dd0..53a2267 100644
--- a/source/world.c
+++ b/source/world.c
@@ -453,7 +453,7 @@ POINT TESTING IN HULLS
 ===============================================================================
 */
 
-#if	!id386
+#if	!USE_INTEL_ASM
 
 /*
 ==================
@@ -488,7 +488,7 @@ int SV_HullPointContents (hull_t *hull, int num, vec3_t p)
 	return num;
 }
 
-#endif	// !id386
+#endif	// !USE_INTEL_ASM
 
 
 /*
diff --git a/source/worlda.S b/source/worlda.S
index a6e77b8..8f4017d 100644
--- a/source/worlda.S
+++ b/source/worlda.S
@@ -28,11 +28,14 @@
 // worlda.s
 // x86 assembly-language server testing stuff
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include "asm_i386.h"
 //#include "quakeasm.h"
 //include "d_ifacea.h"
 
-#if id386
+#if USE_INTEL_ASM
 
 	.data
 
@@ -145,5 +148,5 @@ Lhquickout:
 
 	ret
 
-#endif	// id386
+#endif	// USE_INTEL_ASM