Committing in .

 Modified Files:
 	Mesa/src/descrip.mms Mesa/src/FX/fxtris.c Mesa/src/FX/fxvb.c

 -updated OpenVMS makefile
 -fixed compilation if FX is NOT defined.
----------------------------------------------------------------------

diff --git a/src/mesa/drivers/glide/fxtris.c b/src/mesa/drivers/glide/fxtris.c
index 5129a94..150a3f8 100644 (file)
--- a/src/mesa/drivers/glide/fxtris.c
+++ b/src/mesa/drivers/glide/fxtris.c
@@ -32,6 +32,8 @@
 #include <stdio.h>
 #include <math.h>
 
+#ifdef FX
+
 #include "glheader.h"
 #include "mtypes.h"
 #include "macros.h"
@@ -822,3 +824,19 @@ void fxDDInitTriFuncs( GLcontext *ctx )
    
    (void) fx_print_vertex;
 }
+
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_tris(void);
+int
+gl_fx_dummy_function_tris(void)
+{
+   return 0;
+}
+
+#endif /* FX */

diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index 9468d83..62e93f8 100644 (file)
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -24,6 +24,8 @@
  */
 /* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfxvb.c,v 1.7 2000/11/08 05:02:43 dawes Exp $ */
  
+#ifdef FX
+
 #include "glheader.h"
 #include "mtypes.h"
 #include "mem.h"
@@ -391,3 +393,18 @@ void fxFreeVB( GLcontext *ctx )
       fxMesa->UbyteColor.Ptr = 0;
    }
 }
+#else
+
+
+/*
+ * Need this to provide at least one external definition.
+ */
+
+extern int gl_fx_dummy_function_vb(void);
+int
+gl_fx_dummy_function_vb(void)
+{
+   return 0;
+}
+
+#endif /* FX */

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index faabc1f..2b662b0 100644 (file)
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -112,7 +112,6 @@ RASTER_SOURCES = [.swrast]s_aatriangle.c \
 [.swrast]s_triangle.c \
 [.swrast]s_zoom.c \
 [.swrast_setup]ss_context.c \
-[.swrast_setup]ss_interp.c \
 [.swrast_setup]ss_triangle.c \
 [.swrast_setup]ss_vb.c 
 
@@ -260,7 +259,6 @@ OBJECTS9=[.swrast]s_readpix.obj,\
 [.swrast]s_zoom.obj
 
 OBJECTS10=[.swrast_setup]ss_context.obj,\
-[.swrast_setup]ss_interp.obj,\
 [.swrast_setup]ss_triangle.obj,\
 [.swrast_setup]ss_vb.obj 
 
@@ -469,8 +467,6 @@ imports.obj : imports.c
        $(CC) $(CFLAGS) /obj=[.swrast]s_zoom.obj [.swrast]s_zoom.c
 [.swrast_setup]ss_context.obj : [.swrast_setup]ss_context.c
        $(CC) $(CFLAGS) /obj=[.swrast_setup]ss_context.obj [.swrast_setup]ss_context.c
-[.swrast_setup]ss_interp.obj : [.swrast_setup]ss_interp.c
-       $(CC) $(CFLAGS) /obj=[.swrast_setup]ss_interp.obj [.swrast_setup]ss_interp.c
 [.swrast_setup]ss_triangle.obj : [.swrast_setup]ss_triangle.c
        $(CC) $(CFLAGS) /obj=[.swrast_setup]ss_triangle.obj [.swrast_setup]ss_triangle.c
 [.swrast_setup]ss_vb.obj : [.swrast_setup]ss_vb.c