X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.X11;h=b5ec4be2261e7d85dfa33c37f704ff47c97d23b9;hb=85ad44b29294c2b40e147dba17cbdd8698355ca5;hp=364b67ae5e42ded87ababef0486716ba83d2749f;hpb=ae6c594908567e6f980be20cda9a96d8fffe56b7;p=mesa.git

diff --git a/Makefile.X11 b/Makefile.X11
index 364b67ae5e4..b5ec4be2261 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.106 2004/01/10 22:14:51 brianp Exp $
+# $Id: Makefile.X11,v 1.113 2004/01/30 23:32:19 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  6.0
+# Version:  6.1
 # 
 # Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
 # 
@@ -182,7 +182,7 @@ irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:
 	fi
 	if [ -d src/glw ] ; then \
 		cd src/glw ; \
-		touch src/glw/depend ; \
+		touch depend ; \
 		$(MAKE) -f Makefile.X11 $@ ; \
 	fi
 	if [ -d progs/demos ] ; then \
@@ -221,7 +221,7 @@ irix6-64 irix6-64-dso:
 	fi
 	if [ -d src/glw ] ; then \
 		cd src/glw ; \
-		touch src/glw/depend ; \
+		touch depend ; \
 		$(MAKE) -f Makefile.X11 $@ ; \
 	fi
 	if [ -d progs/demos ] ; then \
@@ -241,6 +241,19 @@ irix6-64 irix6-64-dso:
 		$(MAKE) -f Makefile.X11 $@ ; \
 	fi
 
+irix6-mgl-n32-dso:
+	-mkdir libMGL32
+	if [ -d src/mesa ] ; then \
+		cd src/mesa ; \
+		touch depend ; \
+		$(MAKE) -f Makefile.X11 $@ ; \
+	fi
+	if [ -d src/glu/sgi ] ; then \
+		cd src/glu/sgi ; \
+		touch depend ; \
+		$(MAKE) -f Makefile.X11 $@ ; \
+	fi
+
 beos-r4:
 	-mkdir lib
 	if [ -d src/mesa ] ; then \
@@ -303,7 +316,7 @@ linux-ggi linux-x86-ggi:
 	fi
 	if [ -d src/glw ] ; then \
 		cd src/glw ; \
-		touch src/glw/depend ; \
+		touch depend ; \
 		$(MAKE) -f Makefile.X11 $@ ; \
 	fi
 	if [ -d progs/demos ] ; then \
@@ -365,6 +378,7 @@ linux-solo:
 	cd src/mesa/drivers/dri/gamma  ; touch depend ; $(MAKE) -f Makefile.solo $@
 	cd src/mesa/drivers/dri/tdfx   ; touch depend ; $(MAKE) -f Makefile.solo $@
 	cd src/mesa/drivers/dri/fb     ; touch depend ; $(MAKE) -f Makefile.solo $@
+	cd src/mesa/drivers/dri/unichrome ; touch depend ; $(MAKE) -f Makefile.solo $@
 	cd src/glx/mini                ; touch depend ; $(MAKE) -f Makefile.solo $@
 	if [ -d src/glu/sgi ] ; then \
 		cd src/glu/sgi ; \
@@ -403,20 +417,20 @@ linux-solo:
 # Remove .o files, emacs backup files, etc.
 # XXX this should be cleaned up
 clean:
-	if ! [ -f src/mesa/depend      ] ; then touch src/mesa/depend      ; fi
-	if ! [ -f src/mesa/drivers/dri/r200/depend ];   then touch src/mesa/drivers/dri/r200/depend;   fi
-	if ! [ -f src/mesa/drivers/dri/r128/depend ];   then touch src/mesa/drivers/dri/r128/depend;   fi
-	if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
-	if ! [ -f src/mesa/drivers/dri/mga/depend ];    then touch src/mesa/drivers/dri/mga/depend;    fi
-	if ! [ -f src/mesa/drivers/dri/fb/depend ];     then touch src/mesa/drivers/dri/fb/depend;     fi
-	if ! [ -f src/glu/mesa/depend  ] ; then touch src/glu/mesa/depend  ; fi
-	if ! [ -f src/glu/sgi/depend   ] ; then touch src/glu/sgi/depend   ; fi
-	if ! [ -f src/glu/mini/depend  ] ; then touch src/glu/mini/depend  ; fi
-	if ! [ -f src/glut/glx/depend  ] ; then touch src/glut/glx/depend  ; fi
-	if ! [ -f src/glut/mini/depend ] ; then touch src/glut/mini/depend ; fi
-	if ! [ -f src/glx/mini/depend  ] ; then touch src/glx/mini/depend  ; fi
-	if ! [ -f progs/tests/depend   ] ; then touch progs/tests/depend   ; fi
-	if ! [ -f progs/miniglx/depend ] ; then touch progs/miniglx/depend ; fi
+#	if ! [ -f src/mesa/depend      ] ; then touch src/mesa/depend      ; fi
+#	if ! [ -f src/mesa/drivers/dri/r200/depend ];   then touch src/mesa/drivers/dri/r200/depend;   fi
+#	if ! [ -f src/mesa/drivers/dri/r128/depend ];   then touch src/mesa/drivers/dri/r128/depend;   fi
+#	if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
+#	if ! [ -f src/mesa/drivers/dri/mga/depend ];    then touch src/mesa/drivers/dri/mga/depend;    fi
+#	if ! [ -f src/mesa/drivers/dri/fb/depend ];     then touch src/mesa/drivers/dri/fb/depend;     fi
+#	if ! [ -f src/glu/mesa/depend  ] ; then touch src/glu/mesa/depend  ; fi
+#	if ! [ -f src/glu/sgi/depend   ] ; then touch src/glu/sgi/depend   ; fi
+#	if ! [ -f src/glu/mini/depend  ] ; then touch src/glu/mini/depend  ; fi
+#	if ! [ -f src/glut/glx/depend  ] ; then touch src/glut/glx/depend  ; fi
+#	if ! [ -f src/glut/mini/depend ] ; then touch src/glut/mini/depend ; fi
+#	if ! [ -f src/glx/mini/depend  ] ; then touch src/glx/mini/depend  ; fi
+#	if ! [ -f progs/tests/depend   ] ; then touch progs/tests/depend   ; fi
+#	if ! [ -f progs/miniglx/depend ] ; then touch progs/miniglx/depend ; fi
 	-rm -f include/GL/*~
 	cd src/mesa          && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/mesa/drivers/dri/r200   && $(MAKE) -f Makefile.solo $@ || true
@@ -424,6 +438,7 @@ clean:
 	cd src/mesa/drivers/dri/radeon && $(MAKE) -f Makefile.solo $@ || true
 	cd src/mesa/drivers/dri/mga    && $(MAKE) -f Makefile.solo $@ || true
 	cd src/mesa/drivers/dri/fb     && $(MAKE) -f Makefile.solo $@ || true
+	cd src/mesa/drivers/dri/unichrome && $(MAKE) -f Makefile.solo $@ || true
 	cd src/glu/mesa      && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glu/sgi       && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glu/mini      && $(MAKE) -f Makefile.X11 $@ || true
@@ -437,20 +452,20 @@ clean:
 	cd progs/samples     && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/tests       && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/miniglx     && $(MAKE) -f Makefile.solo $@ || true
-	if [ -f src/mesa/depend      ] ; then rm src/mesa/depend      ; fi
-	if [ -f src/mesa/drivers/dri/r200/depend ];   then rm -f src/mesa/drivers/dri/r200/depend;   fi
-	if [ -f src/mesa/drivers/dri/r128/depend ];   then rm -f src/mesa/drivers/dri/r128/depend;   fi
-	if [ -f src/mesa/drivers/dri/radeon/depend ]; then rm -f src/mesa/drivers/dri/radeon/depend; fi
-	if [ -f src/mesa/drivers/dri/mga/depend ];    then rm -f src/mesa/drivers/dri/mga/depend;    fi
-	if [ -f src/mesa/drivers/dri/fb/depend ];     then rm -f src/mesa/drivers/dri/fb/depend;     fi
-	if [ -f src/glu/mesa/depend  ] ; then rm -f src/glu/mesa/depend  ; fi
-	if [ -f src/glu/sgi/depend   ] ; then rm -f src/glu/sgi/depend   ; fi
-	if [ -f src/glu/mini/depend  ] ; then rm -f src/glu/mini/depend  ; fi
-	if [ -f src/glut/glx/depend  ] ; then rm -f src/glut/glx/depend  ; fi
-	if [ -f src/glut/mini/depend ] ; then rm -f src/glut/mini/depend ; fi
-	if [ -f src/glx/mini/depend  ] ; then rm -f src/glx/mini/depend  ; fi
-	if [ -f progs/tests/depend   ] ; then rm -f progs/tests/depend   ; fi
-	if [ -f progs/miniglx/depend ] ; then rm -f progs/miniglx/depend ; fi
+#	if [ -f src/mesa/depend      ] ; then rm src/mesa/depend      ; fi
+#	if [ -f src/mesa/drivers/dri/r200/depend ];   then rm -f src/mesa/drivers/dri/r200/depend;   fi
+#	if [ -f src/mesa/drivers/dri/r128/depend ];   then rm -f src/mesa/drivers/dri/r128/depend;   fi
+#	if [ -f src/mesa/drivers/dri/radeon/depend ]; then rm -f src/mesa/drivers/dri/radeon/depend; fi
+#	if [ -f src/mesa/drivers/dri/mga/depend ];    then rm -f src/mesa/drivers/dri/mga/depend;    fi
+#	if [ -f src/mesa/drivers/dri/fb/depend ];     then rm -f src/mesa/drivers/dri/fb/depend;     fi
+#	if [ -f src/glu/mesa/depend  ] ; then rm -f src/glu/mesa/depend  ; fi
+#	if [ -f src/glu/sgi/depend   ] ; then rm -f src/glu/sgi/depend   ; fi
+#	if [ -f src/glu/mini/depend  ] ; then rm -f src/glu/mini/depend  ; fi
+#	if [ -f src/glut/glx/depend  ] ; then rm -f src/glut/glx/depend  ; fi
+#	if [ -f src/glut/mini/depend ] ; then rm -f src/glut/mini/depend ; fi
+#	if [ -f src/glx/mini/depend  ] ; then rm -f src/glx/mini/depend  ; fi
+#	if [ -f progs/tests/depend   ] ; then rm -f progs/tests/depend   ; fi
+#	if [ -f progs/miniglx/depend ] ; then rm -f progs/miniglx/depend ; fi
 
 
 # Remove everything that can be remade
@@ -473,10 +488,10 @@ cvsclean: realclean
 
 
 
-DIRECTORY = Mesa-6.0
-LIB_NAME = MesaLib-6.0
-DEMO_NAME = MesaDemos-6.0
-GLU_NAME = MesaGLU-6.0
+DIRECTORY = Mesa-6.1
+LIB_NAME = MesaLib-6.1
+DEMO_NAME = MesaDemos-6.1
+GLU_NAME = MesaGLU-6.1
 GLUT_NAME = GLUT-3.7
 
 
@@ -549,6 +564,7 @@ LIB_FILES =	\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.h				\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
@@ -631,14 +647,16 @@ DEMO_FILES =	\
 	$(DIRECTORY)/src/glut/dos/*.[ch]		\
 	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
 	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
-	$(DIRECTORY)/progs/images/*			\
+	$(DIRECTORY)/progs/images/*.rgb			\
+	$(DIRECTORY)/progs/images/*.rgba		\
 	$(DIRECTORY)/progs/demos/Makefile*		\
 	$(DIRECTORY)/progs/demos/descrip.mms		\
 	$(DIRECTORY)/progs/demos/*.[ch]			\
 	$(DIRECTORY)/progs/demos/*.cxx			\
 	$(DIRECTORY)/progs/demos/*.dat			\
 	$(DIRECTORY)/progs/demos/README			\
-	$(DIRECTORY)/progs/demos/Windows/*		\
+	$(DIRECTORY)/progs/demos/Windows/*.dsp		\
+	$(DIRECTORY)/progs/demos/Windows/*.dsw		\
 	$(DIRECTORY)/progs/xdemos/Makefile*		\
 	$(DIRECTORY)/progs/xdemos/descrip.mms		\
 	$(DIRECTORY)/progs/xdemos/*.[chf]		\