guard ResetStipple calls
[mesa.git] / Makefile.X11
index ce50431beabe35fdab859e2d24317065a837b770..093807bfaa9e1dc914804ec10b7a1f69fb609fff 100644 (file)
@@ -1,9 +1,9 @@
-# $Id: Makefile.X11,v 1.48 2001/06/19 21:49:06 brianp Exp $
+# $Id: Makefile.X11,v 1.58 2001/11/30 19:42:10 kschultz Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
+# Version:  4.1
 # 
-# Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+# Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -42,6 +42,7 @@ default:
        @echo "  make bsdos4               for BSD/OS 4.x, dynamic libraries"
        @echo "  make cygnus               for Win95/NT using Cygnus-Win32"
        @echo "  make cygnus-linux         for Win95/NT using Cygnus-Win32 under Linux"
+       @echo "  make darwin               for Darwin - Mac OS X"
        @echo "  make dgux                 for Data General"
        @echo "  make freebsd              for FreeBSD systems with GCC"
        @echo "  make freebsd-386          for FreeBSD systems with GCC, w/ Intel assembly"
@@ -85,6 +86,7 @@ default:
        @echo "  make linux-sparc5-elf     for Sparc5 systems, make ELF shared libs"
        @echo "  make linux-sparc-ultra    for UltraSparc systems, make ELF shared libs"
        @echo "  make linux-osmesa16       for 16-bit/channel OSMesa"
+       @echo "  make linux-osmesa32       for 32-bit/channel OSMesa"
        @echo "  make lynxos               for LynxOS systems with GCC"
        @echo "  make macintosh            for Macintosh"
        @echo "  make machten-2.2          for Macs w/ MachTen 2.2 (68k w/ FPU)"
@@ -136,7 +138,7 @@ default:
 # XXX we may have to split up this group of targets into those that
 # have a C++ compiler and those that don't for the SI-GLU library.
 
-aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
+aix aix-sl amix bsdos bsdos4 darwin dgux freebsd freebsd-386 gcc \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
@@ -294,7 +296,7 @@ linux-ggi-install linux-386-ggi-install:
 #      echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
 #      fi
 
-linux-osmesa16:
+linux-osmesa16 linux-osmesa32:
        -mkdir lib
        if [ -d src ] ; then touch src/depend ; fi
        if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi
@@ -331,10 +333,10 @@ realclean: clean
 
 
 
-DIRECTORY = Mesa-3.5
-LIB_NAME = MesaLib-3.5
-DEMO_NAME = MesaDemos-3.5
-GLU_NAME = MesaGLU-3.5
+DIRECTORY = Mesa-4.0
+LIB_NAME = MesaLib-4.0
+DEMO_NAME = MesaDemos-4.0
+GLU_NAME = MesaGLU-4.0
 GLUT_NAME = GLUT-3.7
 
 
@@ -395,6 +397,8 @@ LIB_FILES = \
        $(DIRECTORY)/include/GL/mglmesa.h                               \
        $(DIRECTORY)/include/GL/osmesa.h                                \
        $(DIRECTORY)/include/GL/svgamesa.h                              \
+       $(DIRECTORY)/include/GL/ugl*.h                                  \
+       $(DIRECTORY)/include/GL/vms_x_fix.h                             \
        $(DIRECTORY)/include/GL/wmesa.h                                 \
        $(DIRECTORY)/include/GL/xmesa.h                                 \
        $(DIRECTORY)/include/GL/xmesa_x.h                               \
@@ -405,7 +409,6 @@ LIB_FILES = \
        $(DIRECTORY)/src/Makefile*                                      \
        $(DIRECTORY)/src/libGL_la_SOURCES                               \
        $(DIRECTORY)/src/descrip.mms                                    \
-       $(DIRECTORY)/src/mms_depend                                     \
        $(DIRECTORY)/src/mesa.conf                                      \
        $(DIRECTORY)/src/*.def                                          \
        $(DIRECTORY)/src/depend                                         \
@@ -423,6 +426,14 @@ LIB_FILES =        \
        $(DIRECTORY)/src/tnl/*.[ch]                                     \
        $(DIRECTORY)/src/tnl/Makefile*                                  \
        $(DIRECTORY)/src/tnl/libMesaTnl_la_SOURCES                      \
+       $(DIRECTORY)/src/tnl_dd/*.[ch]                                  \
+       $(DIRECTORY)/src/tnl_dd/imm/*.[ch]                              \
+       $(DIRECTORY)/src/tnl_dd/imm/NOTES.imm                           \
+       $(DIRECTORY)/src/windml/*.[ch]                                  \
+       $(DIRECTORY)/src/windml/tornado/*.c                             \
+       $(DIRECTORY)/src/windml/tornado/*.cdf                           \
+       $(DIRECTORY)/src/windml/man3/*.3                                \
+       $(DIRECTORY)/src/windml/man3/*.html                             \
        $(DIRECTORY)/src/BeOS/*.cpp                                     \
        $(DIRECTORY)/src/FX/Makefile.am                                 \
        $(DIRECTORY)/src/FX/Makefile.in                                 \
@@ -454,6 +465,8 @@ LIB_FILES = \
        $(DIRECTORY)/src/KNOWN_BUGS                                     \
        $(DIRECTORY)/src/OSmesa/Makefile.am                             \
        $(DIRECTORY)/src/OSmesa/Makefile.in                             \
+       $(DIRECTORY)/src/OSmesa/Makefile.win                            \
+       $(DIRECTORY)/src/OSmesa/osmesa.def                              \
        $(DIRECTORY)/src/OSmesa/*.[ch]                                  \
        $(DIRECTORY)/src/SPARC/*.[chS]                                  \
        $(DIRECTORY)/src/SPARC/Makefile.am                              \
@@ -476,6 +489,8 @@ LIB_FILES = \
        $(DIRECTORY)/si-glu/Makefile.am                                 \
        $(DIRECTORY)/si-glu/Makefile.in                                 \
        $(DIRECTORY)/si-glu/Makefile.X11                                \
+       $(DIRECTORY)/si-glu/Makefile.win                                \
+       $(DIRECTORY)/si-glu/glu.def                                     \
        $(DIRECTORY)/si-glu/dummy.cc                                    \
        $(DIRECTORY)/si-glu/descrip.mms                                 \
        $(DIRECTORY)/si-glu/mesaglu.opt                                 \
@@ -617,6 +632,9 @@ DEMO_FILES =        \
        $(DIRECTORY)/samples/README             \
        $(DIRECTORY)/samples/*.c                \
        $(DIRECTORY)/mtdemos                    \
+       $(DIRECTORY)/windmldemos/Makefile.ugl   \
+       $(DIRECTORY)/windmldemos/*.c            \
+       $(DIRECTORY)/windmldemos/*.bmp          \
        $(DIRECTORY)/ggi
 
 OBSOLETE_DEMO_FILES = \