summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-08-22 13:47:08 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-08-22 13:47:08 +0000
commit4778beb76129fa68dd57b74ac2f25fd604465289 (patch)
tree0aa04421a3c3b0a42694bbf237175823e11190e4 /src/mesa
parent12c037dbff3d5a812e31624645d577413cd54122 (diff)
updates from Daniel Borca
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Makefile.DJ4
-rw-r--r--src/mesa/Makefile.mgw2
-rw-r--r--src/mesa/drivers/dos/dmesa.c4
3 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ
index 2d9c2d94ef..893a91bc1c 100644
--- a/src/mesa/Makefile.DJ
+++ b/src/mesa/Makefile.DJ
@@ -106,6 +106,8 @@ MAIN_SOURCES = \
main/api_validate.c \
main/accum.c \
main/arbprogram.c \
+ main/arbfragparse.c \
+ main/arbvertparse.c \
main/attrib.c \
main/blend.c \
main/bufferobj.c \
@@ -343,7 +345,7 @@ ifeq ($(HAVEDXE3),)
$(warning Missing DXE3 package... Skipping $(GL_DXE))
else
ifeq ($(FX),1)
- -dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -P glid3.dxe -U $^
+ -dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -P glide3x.dxe -U $^
else
-dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -U $^
endif
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
index 3d72ae35a7..d8fb47c932 100644
--- a/src/mesa/Makefile.mgw
+++ b/src/mesa/Makefile.mgw
@@ -97,6 +97,8 @@ MAIN_SOURCES = \
main/api_validate.c \
main/accum.c \
main/arbprogram.c \
+ main/arbfragparse.c \
+ main/arbvertparse.c \
main/attrib.c \
main/blend.c \
main/bufferobj.c \
diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c
index 7918fe9e9d..73b47569d9 100644
--- a/src/mesa/drivers/dos/dmesa.c
+++ b/src/mesa/drivers/dos/dmesa.c
@@ -1474,7 +1474,7 @@ void DMesaDestroyVisual (DMesaVisual v)
#endif
#else
- fxMesaDestroyContext((tdfxContextPtr)v);
+ fxMesaDestroyContext((fxMesaContext)v);
#endif
}
@@ -1645,7 +1645,7 @@ GLboolean DMesaMakeCurrent (DMesaContext c, DMesaBuffer b)
}
#else
- fxMesaMakeCurrent((tdfxContextPtr)c);
+ fxMesaMakeCurrent((fxMesaContext)c);
#endif
return GL_TRUE;