Performance improvements, support userspace simulatorsHEADmaster

1 files changed, 53 insertions, 3 deletions

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 1315e35..d612675 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -28,6 +28,10 @@ default:
 		$(MAKE) beos ; \
 	elif [ "${DRIVER_DIRS}" = "verite" ] ; then \
 		$(MAKE) verite-alone ; \
+	elif [ "${DRIVER_DIRS}" = "verite-sim" ] ; then \
+		$(MAKE) verite-sim ; \
+	elif [ "${DRIVER_DIRS}" = "glide-sim" ] ; then \
+		$(MAKE) glide-sim ; \
 	else \
 		$(MAKE) stand-alone ; \
 	fi
@@ -171,6 +175,50 @@ verite-alone: depend $(VERITE_ALONE_OBJECTS) $(OSMESA_DRIVER_OBJECTS)
 
 
 ######################################################################
+# Verite driver over the userspace simulator
+
+VERITE_SIM_SOURCES = \
+	$(CORE_SOURCES) \
+	$(COMMON_DRIVER_SOURCES) \
+	$(VERITE_COMMON_DRIVER_SOURCES) \
+	$(PPC_SOURCES)
+
+VERITE_SIM_OBJECTS = $(VERITE_SIM_SOURCES:.c=.o)
+
+-include $(VERITE_SIM_OBJECTS:.o=.d)
+
+# rm -f first: mklib's Darwin static case updates with "ar -ruv", which
+# would keep stale members (e.g. libv3d.o) from a previous config.
+verite-sim: depend $(VERITE_SIM_OBJECTS)
+	rm -f $(LIB_DIR)/$(GL_LIB_NAME)
+	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) \
+		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+		-install $(LIB_DIR) $(MKLIB_OPTIONS) $(GL_LIB_DEPS) \
+		$(VERITE_SIM_OBJECTS)
+
+
+######################################################################
+# fxMesa (3dfx Glide driver) over the userspace Voodoo simulator
+
+GLIDE_SIM_SOURCES = \
+	$(CORE_SOURCES) \
+	$(COMMON_DRIVER_SOURCES) \
+	$(GLIDE_DRIVER_SOURCES) \
+	$(PPC_SOURCES)
+
+GLIDE_SIM_OBJECTS = $(GLIDE_SIM_SOURCES:.c=.o)
+
+-include $(GLIDE_SIM_OBJECTS:.o=.d)
+
+glide-sim: depend $(GLIDE_SIM_OBJECTS)
+	rm -f $(LIB_DIR)/$(GL_LIB_NAME)
+	CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) \
+		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+		-install $(LIB_DIR) $(MKLIB_OPTIONS) $(GL_LIB_DEPS) \
+		$(GLIDE_SIM_OBJECTS)
+
+
+######################################################################
 # Generic stuff
 
 ALL_SOURCES = \
@@ -205,8 +253,10 @@ tags:
 clean:
 	-rm -f */*.o
 	-rm -f depend.bak mesa.a
-	-rm -f */*.d drivers/*/*.d
-	-rm -f drivers/*/*.o
-	(cd drivers/dri ; $(MAKE) clean)
+	-rm -f */*.d drivers/*/*.d drivers/*/*/*.d
+	-rm -f drivers/*/*.o drivers/*/*/*.o
+	@if [ -f drivers/dri/Makefile ] ; then \
+		(cd drivers/dri ; $(MAKE) clean) ; \
+	fi
 
 include depend