TOP = ../..
GL_MAJOR = 1
-GL_MINOR = 4
+GL_MINOR = 5
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
-GL_LIB_NAME = "GL" # may be overridden in Make-config
-OSMESA_LIB_NAME = "OSMesa" # may be overridden in Make-config
+# These may be overridden in Make-config
+GL_LIB_NAME = GL
+OSMESA_LIB_NAME = OSMesa
LIBDIR = $(TOP)/lib
# This should get set in Make-config someday:
DRIVER_SOURCES = \
+ $(COMMON_DRIVER_SOURCES) \
$(X11_DRIVER_SOURCES) \
$(GLIDE_DRIVER_SOURCES) \
$(SVGA_DRIVER_SOURCES) \
$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+# need some special rules here, unfortunately
x86/matypes.h: main/mtypes.h tnl/t_context.h x86/gen_matypes.c
$(CC) $(INCLUDE_DIRS) $(CFLAGS) x86/gen_matypes.c -o x86/gen_matypes
./x86/gen_matypes > x86/matypes.h
- rm -f x86/gen_matypes x86/*.o
+ #rm -f x86/gen_matypes x86/*.o
x86/common_x86_asm.o: x86/matypes.h
+x86/3dnow_normal.o: x86/matypes.h
+x86/3dnow_xform1.o: x86/matypes.h
+x86/3dnow_xform2.o: x86/matypes.h
+x86/3dnow_xform3.o: x86/matypes.h
+x86/3dnow_xform4.o: x86/matypes.h
+x86/mmx_blend.o: x86/matypes.h
+x86/sse_normal.o: x86/matypes.h
+x86/sse_xform1.o: x86/matypes.h
+x86/sse_xform2.o: x86/matypes.h
+x86/sse_xform3.o: x86/matypes.h
+x86/sse_xform4.o: x86/matypes.h
+x86/x86_cliptest.o: x86/matypes.h
+x86/x86_xform2.o: x86/matypes.h
+x86/x86_xform3.o: x86/matypes.h
+x86/x86_xform4.o: x86/matypes.h
if [ ${OSMESA_LIB} ] ; then \
$(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \
-minor $(MESA_MINOR) -patch $(GL_TINY) -L$(LIBDIR) \
- -l$(GL_LIB_NAME) -install $(LIBDIR) \
+ -l$(GL_LIB_NAME) $(OSMESA_LIB_DEPS) \
+ -install $(LIBDIR) \
$(MKLIB_OPTIONS) $(OSMESA_OBJECTS) ; \
fi