summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
| * Cell: added linux-cell-debug configBrian Paul2008-09-031-0/+1
| | | | | | | | | | linux-cell is now the optimized configuration. Remove some Cell-specific stuff from winsys/xlib/Makefile.
| * remove depend.bak in realcleanKeith Whitwell2008-09-011-0/+1
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * mesa: Added linux-egl target, that only builds the i915simple driver and egl ↵Jakob Bornecrantz2008-05-231-0/+1
| | | | | | | | drivers
| * Add an "all" target alias for "default" target.José Fonseca2008-02-181-0/+2
| | | | | | | | "all" is more commonly expected, expecially by many IDEs.
| * Initial Cell driver infrastructure.Brian2007-12-021-0/+1
| | | | | | | | No real code yet. Just stand-ins and make/build infrastructure.
| * Introduce linux-llvm target. Remove the llvm code from the default build for ↵Zack Rusin2007-10-241-0/+1
| | | | | | | | | | | | now. Cleanup some of the debugging output.
| * Update x86's static and profile configs.José Fonseca2007-09-281-0/+2
| |
| * Fix the doxygen target in the top-level Makefile.José Fonseca2007-09-211-1/+4
| |
| * Update linux-profile config.José Fonseca2007-09-191-0/+1
| |
| * Gutsy oopses on touch of existing file. Workaround.Keith Whitwell2007-08-071-5/+3
| |
* | added glu.exports files to tarballs listBrian Paul2008-08-161-0/+2
| |
* | prep for 7.1 rc4Brian Paul2008-08-161-5/+6
| |
* | add yet another MakefileBrian Paul2008-07-081-0/+1
| |
* | bump version to rc3Brian Paul2008-07-081-4/+4
| |
* | added more Makefiles to file listBrian Paul2008-07-081-0/+2
| |
* | added src/mesa/drivers/Makefile to file listBrian Paul2008-07-081-0/+1
| |
* | mesa: bump version to rc2Brian Paul2008-07-081-4/+4
| |
* | DRI-specific pkg-config fileDan Nicholson2008-06-271-0/+1
| | | | | | | | | | | | | | Since the gl pkg-config file doesn't convey any specifics about the backend in use, this adds a new pkg-config file for when DRI is in use. This can be used by the xserver build to determine if the DRI and/or GLX extensions are appropriate.
* | Distribute version.mk in case autoconf needs to be run againDan Nicholson2008-06-101-0/+1
| | | | | | | | | | Users may need to rebuild the configure script, so we need to distribute version.mk so autoconf can run successfully.
* | prep for 7.1 RC1Brian Paul2008-05-271-4/+4
| |
* | drop GLcoreGeorge Sapountzis2008-05-231-9/+1
| |
* | autoconf: Attempt to figure out the PIC flags for the platformDan Nicholson2008-05-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an autoconf macro, MESA_PIC_FLAGS, which sets the PIC flags according to platform and static/shared setting. The platform specifics are taken straight from libtool.m4 and stripped down to just the flags and platforms we cover in Mesa. This should hopefully make it possible to use autoconf on non-GCC platforms. The macro is added external to configure.ac in acinclude.m4 since it's pretty bloated. Note to BSDers: Previously, x86 defaulted to non-PIC on FreeBSD. I didn't carry that preference into this macro. Instead, you can just use --disable-pic where desired.
* | Never fail `make clean'Dan Nicholson2008-05-071-4/+4
| | | | | | | | | | | | Mostly some pedantic changes such that `make clean' always ignores errors. Also changed the top clean target to do the `touch configs/current' dance instead of realclean.
* | Update make output for autoconf helpDan Nicholson2008-05-061-1/+5
| |
* | Always cleanup the makedepend backup filesDan Nicholson2008-05-061-4/+2
| | | | | | | | | | | | Consistently cleanup the depend.bak files created by makedepend. Also, realclean has been changed to use a single find command, which speeds it up considerably.
* | Error consistently when running recursive makeDan Nicholson2008-05-061-3/+3
| | | | | | | | | | When changing directories and running a sub-make, ensure that both the cd and make commands propagate errors to the parent make.
* | Add .PHONY targets to top Makefile for non-file targetsDan Nicholson2008-05-061-0/+6
| | | | | | | | | | | | | | When a make target doesn't result in a file of the same name, adding it to a .PHONY target means make won't look for such a file, speeding the build up a bit. This allows `make doxygen' to work since otherwise make will consider the doxygen directory as up to date.
* | fix make tarballsGeorge Sapountzis2008-04-251-11/+0
| |
* | glcore: build from mesaGeorge Sapountzis2008-04-231-0/+7
| |
* | Darwin: Config/source fixes to now build glxdemo apps and OSMesaJeremy Huddleston2008-03-101-1/+2
| | | | | | | | | | Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config (cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)
* | Distribute dri_sarea.h with the tarballsDan Nicholson2008-02-171-0/+1
| | | | | | | | | | The GL/internal/dri_sarea.h header was missing from the tarballs, causing the build to bomb for DRI2.
* | Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>)Brian2008-01-231-0/+1
| |
* | autoconf: Include necessary files for the tarballsDan Nicholson2007-12-071-1/+21
| | | | | | | | | | | | | | | | Add targets to the top Makefile so that configure and the necessary scripts are added to the tarball for distribution. Variables are used for autoconf and aclocal in case anyone needs to use a specific version or pass any extra flags.
* | autoconf: Initial support for an autoconf configurationDan Nicholson2007-12-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the initial support for using autoconf configuration. Support is available for shared Xlib driver builds. Later this will be extended to dri and osmesa-only builds and possibly targetting non-X backends. Support for static library builds will also be added. The configure script fills in the autoconf config. This is then used by running `make autoconf' after ./configure. Testing has been done on Linux/GNU. The configure script tries to faithfully reproduce the current configs/linux* and configs/freebsd*. Other platforms can be handled later by adding similar statements and feature tests. Pkg-config is used to search for packages when possible. This makes the build much more flexible and robust to the user's configuration. This requires that the pkg-config autoconf macros pkg.m4 are included in aclocal.m4. This requires autoconf and aclocal from autoconf and automake, respectively.
* | add glw.pc.in to tarball list, remove from DEPEND_FILESBrian2007-11-121-1/+1
| |
* | added catamount-osmesa-pgi configAlex Neundorf2007-10-241-0/+1
| |
* | add directfb glut sources to tarballBrian2007-10-231-0/+3
| |
* | fixes for bluegene-xlc-osmesa configBrian2007-09-201-0/+1
| |
* | added .pc.in files to tarballsBrian2007-09-131-0/+4
| |
* | remove SHELL line, replace -e test with new logic (Daniel Stone)Brian2007-08-071-3/+1
| |
* | fix missing backslashBrian2007-08-021-1/+1
| |
* | added bluegene-osmesaBrian2007-08-021-0/+1
| |
* | added sunos5-v9-cc-g++ configBrian2007-07-311-0/+3
|/
* Fix a number of MINGW32 issuesZhang2007-07-211-0/+1
|
* remove VC6/VC7 project files until updatedBrian2007-07-211-11/+0
|
* add fbdev/ to DEMO_FILESBrian2007-07-041-0/+2
|
* master/trunk is now for Mesa 7.1 devel: bump versionsBrian2007-05-141-4/+4
|
* Tweak the shell scripting for descending into and building subdirs.Brian2007-05-091-3/+10
| | | | | | | | | | | | | | In general, use this: @for dir in $(SUBDIRS) ; do \ if [ -d $$dir ] ; then \ (cd $$dir && $(MAKE)) || exit 1; \ fi \ done Basically, silently skip missing subdirs but generate an error and stop if there's a compilation or install problem. This was done inconsistantly before. In once case, a missing subdir was causing us to go into an infinte loop!