summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-08-18 14:47:16 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-08-18 14:47:16 +0000
commite41460bf774f5afb4ec60b9c4f70e3dd0d80ef94 (patch)
tree224581e78eb5089c145f6d3697d85346bded1994
parent6aa5b4cb914daeeeaf0d1b7a4e0276f2294812d3 (diff)
updates from Jouk
-rw-r--r--src/mesa/main/descrip.mms7
-rw-r--r--src/mesa/tnl/descrip.mms11
-rw-r--r--src/mesa/tnl/t_vertex_c.c2
3 files changed, 11 insertions, 9 deletions
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index 1f11b24a8c..3de12bdb0a 100644
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -1,12 +1,12 @@
# Makefile for core library for VMS
# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
+# Last revision : 18 August 2004
-.first
+first
define gl [---.include.gl]
define math [-.math]
-.include [---]mms-config.
+include [---]mms-config.
##### MACROS #####
@@ -174,6 +174,7 @@ state.obj : state.c
stencil.obj : stencil.c
texcompress.obj : texcompress.c
texcompress_fxt1.obj : texcompress_fxt1.c
+ cc$(CFLAGS)/warn=(disable=SHIFTCOUNT) texcompress_fxt1.c
texcompress_s3tc.obj : texcompress_s3tc.c
texformat.obj : texformat.c
teximage.obj : teximage.c
diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms
index f5fd1fd57f..3a548dbe10 100644
--- a/src/mesa/tnl/descrip.mms
+++ b/src/mesa/tnl/descrip.mms
@@ -1,13 +1,13 @@
# Makefile for core library for VMS
# contributed by Jouk Jansen joukj@hrem.stm.tudelft.nl
-# Last revision : 16 June 2003
+# Last revision : 18 August 2004
-.first
+first
define gl [---.include.gl]
define math [-.math]
define array_cache [-.array_cache]
-.include [---]mms-config.
+include [---]mms-config.
##### MACROS #####
@@ -22,14 +22,14 @@ SOURCES = t_array_api.c t_array_import.c t_context.c \
t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \
t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \
t_vtx_eval.c t_vtx_exec.c t_save_playback.c t_save_loopback.c \
- t_vertex.c t_vtx_generic.c t_vtx_x86.c
+ t_vertex.c t_vtx_generic.c t_vtx_x86.c t_vertex_c.c;
OBJECTS = t_array_api.obj,t_array_import.obj,t_context.obj,\
t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\
t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\
t_vb_texmat.obj,t_vb_vertex.obj,t_save_api.obj,t_vtx_api.obj,\
t_vtx_eval.obj,t_vtx_exec.obj,t_save_playback.obj,t_save_loopback.obj,\
- t_vertex.obj,t_vtx_generic.obj,t_vtx_x86.obj
+ t_vertex.obj,t_vtx_generic.obj,t_vtx_x86.obj,t_vertex_c.obj
##### RULES #####
@@ -66,3 +66,4 @@ t_save_loopback.obj : t_save_loopback.c
t_vertex.obj : t_vertex.c
t_vtx_x86.obj : t_vtx_x86.c
t_vtx_generic.obj : t_vtx_generic.c
+t_vertex_c.obj : t_vertex_c.c
diff --git a/src/mesa/tnl/t_vertex_c.c b/src/mesa/tnl/t_vertex_c.c
index a0ec489405..0c3fd00401 100644
--- a/src/mesa/tnl/t_vertex_c.c
+++ b/src/mesa/tnl/t_vertex_c.c
@@ -234,7 +234,7 @@ static GLboolean print_attr_footer( struct tnl_clipspace_codegen *p )
static tnl_emit_func print_store_func( struct tnl_clipspace_codegen *p )
{
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __VMS )
fprintf(stderr, "%s: emitted:\n%s\n", "print_store_func", p->buf);
#else
fprintf(stderr, "%s: emitted:\n%s\n", __FUNCTION__, p->buf);