new fix for initial window size problem
[mesa.git] / Makefile.X11
index 7a68d147ea4eb1c182723ce4f937af92d2a743a1..22963d2245d385bcc9795e01fcde3bc5ef526edd 100644 (file)
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.56 2001/10/17 20:44:26 brianp Exp $
+# $Id: Makefile.X11,v 1.62 2002/05/05 16:00:06 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  4.0
+# Version:  4.1
 # 
 # Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
 # 
@@ -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"
@@ -86,6 +87,7 @@ default:
        @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 linux-icc            for Linux with the Intel C/C++ compiler"
        @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)"
@@ -137,12 +139,12 @@ 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 \
+irix4 irix5 irix5-gcc irix5-dso \
 linux linux-static linux-debug linux-static-debug linux-prof \
-linux-x86 linux-x86-static linux-x86-debug \
+linux-x86 linux-icc linux-x86-static linux-x86-debug \
 linux-glide linux-386-glide linux-386-opt-glide \
 linux-x86-glide linux-glide-debug linux-glide-prof \
 linux-alpha-static linux-alpha \
@@ -171,12 +173,11 @@ sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
        if [ -d book     ] ; then cd book     ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
 
-irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
+irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
        -mkdir lib32
        if [ -d src      ] ; then touch src/depend      ; fi
        if [ -d src-glu  ] ; then touch src-glu/depend  ; fi
        if [ -d src-glut ] ; then touch src-glut/depend ; fi
-       if [ -d src-glut ] ; then touch src-glut/depend ; fi
        if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
        if [ -d src      ] ; then cd src      ; $(MAKE) -f Makefile.X11 $@ ; fi
        if [ -d src-glu  ] ; then cd src-glu  ; $(MAKE) -f Makefile.X11 $@ ; fi
@@ -322,20 +323,17 @@ clean:
 
 # Remove everything that can be remade
 realclean: clean
-       -rm -f lib/*
+       -rm -fr lib lib32 lib64
        cd demos       && $(MAKE) -f Makefile.X11 realclean || true
        cd xdemos      && $(MAKE) -f Makefile.X11 realclean || true
        cd book        && $(MAKE) -f Makefile.X11 realclean || true
        cd samples     && $(MAKE) -f Makefile.X11 realclean || true
-       cd ggi/demos   && $(MAKE) -f Makefile.X11 realclean || true
-       cd src/GGI/default && $(MAKE) -f Makefile.X11 realclean || true
-
 
 
-DIRECTORY = Mesa-4.0
-LIB_NAME = MesaLib-4.0
-DEMO_NAME = MesaDemos-4.0
-GLU_NAME = MesaGLU-4.0
+DIRECTORY = Mesa-4.1
+LIB_NAME = MesaLib-4.1
+DEMO_NAME = MesaDemos-4.1
+GLU_NAME = MesaGLU-4.1
 GLUT_NAME = GLUT-3.7
 
 
@@ -380,7 +378,7 @@ LIB_FILES = \
        $(DIRECTORY)/include/GL/internal/glcore.h                       \
        $(DIRECTORY)/include/GL/Makefile.in                             \
        $(DIRECTORY)/include/GL/Makefile.am                             \
-       $(DIRECTORY)/include/GL/dosmesa.h                               \
+       $(DIRECTORY)/include/GL/dmesa.h                                 \
        $(DIRECTORY)/include/GL/amesa.h                                 \
        $(DIRECTORY)/include/GL/fxmesa.h                                \
        $(DIRECTORY)/include/GL/ggimesa.h                               \
@@ -403,6 +401,7 @@ LIB_FILES = \
        $(DIRECTORY)/include/GL/xmesa_x.h                               \
        $(DIRECTORY)/include/GL/xmesa_xf86.h                            \
        $(DIRECTORY)/include/GLView.h                                   \
+       $(DIRECTORY)/include/dmesadxe.h                                 \
        $(DIRECTORY)/include/Makefile.in                                \
        $(DIRECTORY)/include/Makefile.am                                \
        $(DIRECTORY)/src/Makefile*                                      \
@@ -433,6 +432,7 @@ LIB_FILES = \
        $(DIRECTORY)/src/windml/tornado/*.cdf                           \
        $(DIRECTORY)/src/windml/man3/*.3                                \
        $(DIRECTORY)/src/windml/man3/*.html                             \
+       $(DIRECTORY)/src/DOS/*.[ch]                                     \
        $(DIRECTORY)/src/BeOS/*.cpp                                     \
        $(DIRECTORY)/src/FX/Makefile.am                                 \
        $(DIRECTORY)/src/FX/Makefile.in                                 \
@@ -581,7 +581,6 @@ OBSOLETE_LIB_FILES = \
        $(DIRECTORY)/src/D3D/*bat                                       \
        $(DIRECTORY)/src/D3D/*DEF                                       \
        $(DIRECTORY)/src/DOS/DEPEND.DOS                                 \
-       $(DIRECTORY)/src/DOS/*.c                                        \
        $(DIRECTORY)/src/S3/*.[ch]                                      \
        $(DIRECTORY)/src/S3/*.def                                       \
        $(DIRECTORY)/src/S3/*.mak                                       \
@@ -614,6 +613,9 @@ DEMO_FILES =        \
        $(DIRECTORY)/src-glut/descrip.mms       \
        $(DIRECTORY)/src-glut/mms_depend        \
        $(DIRECTORY)/src-glut/*.[ch]            \
+       $(DIRECTORY)/src-glut.dos/*.[ch]        \
+       $(DIRECTORY)/src-glut.dos/Makefile.DJ   \
+       $(DIRECTORY)/src-glut.dos/PC_HW/*.[chS] \
        $(DIRECTORY)/images/*                   \
        $(DIRECTORY)/demos/Makefile*            \
        $(DIRECTORY)/demos/descrip.mms          \