I am attaching to this mail the patch between the current
CVS version of src/Makefile.fx and my current version.
Changes:
changed the FX_V2 to NOT be defined by default,
also made it separately commented option
added vertices.obj
Brian, could you apply this to the CVS
(contact me if you want it in some other format)
Eero
Index: Makefile.fx
===================================================================
RCS file: /cvs/mesa3d/Mesa/src/Makefile.fx,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile.fx
*** Makefile.fx 1999/08/19 00:55:41 1.1.1.1
--- Makefile.fx 1999/09/08 06:07:58
***************
*** 14,19 ****
--- 14,22 ----
#to disable using the assembly files
NASM=nasmw
+ #if you have a Voodoo2 or latter activate the following
+ #V2_OPTS=/DFX_V2
+
#DO_VTUNE can be used to generate VTUNE compatible
#libraries, they can propably be used for other
#debugging purposes also.
***************
*** 49,55 ****
CFLAGS = $(cvarsdll) $(VTUNE_CC_OPTS) /Ox /G6 /Gd /MD /D__i386__ \
/DBUILD_GL32 /DMESA_FX_DDRAW /DMESA_MINWARN $(X86OPT) \
! /D__MSC__ /DFX /DFX_V2 /D__WIN32__ /DWIN32 /I..\include /I.
!if "$(GLIDE2SDK)" != ""
--- 52,58 ----
CFLAGS = $(cvarsdll) $(VTUNE_CC_OPTS) /Ox /G6 /Gd /MD /D__i386__ \
/DBUILD_GL32 /DMESA_FX_DDRAW /DMESA_MINWARN $(X86OPT) \
! /D__MSC__ /DFX $(V2_OPTS) /D__WIN32__ /DWIN32 /I..\include /I.
!if "$(GLIDE2SDK)" != ""
***************
*** 67,73 ****
span.obj stages.obj stencil.obj teximage.obj texobj.obj\
texstate.obj texture.obj translate.obj triangle.obj \
varray.obj vbindirect.obj winpos.obj vb.obj vbcull.obj vbfill.obj\
! vbrender.obj vbxform.obj vector.obj xform.obj zoom.obj
--- 70,76 ----
span.obj stages.obj stencil.obj teximage.obj texobj.obj\
texstate.obj texture.obj translate.obj triangle.obj \
varray.obj vbindirect.obj winpos.obj vb.obj vbcull.obj vbfill.obj\
! vbrender.obj vbxform.obj vector.obj vertices.obj xform.obj zoom.obj
