summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2008-11-01Merge commit 'origin/master' into gallium-0.2Alan Hourihane1-0/+2
Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-10-28mesa: include glslcompiler driver in tarballBrian Paul1-0/+2
2008-09-11Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell1-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
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell1-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
2008-09-03Cell: added linux-cell-debug configBrian Paul1-0/+1
linux-cell is now the optimized configuration. Remove some Cell-specific stuff from winsys/xlib/Makefile.
2008-09-01remove depend.bak in realcleanKeith Whitwell1-0/+1
2008-08-16added glu.exports files to tarballs listBrian Paul1-0/+2
2008-08-16prep for 7.1 rc4Brian Paul1-5/+6
2008-07-08add yet another MakefileBrian Paul1-0/+1
2008-07-08bump version to rc3Brian Paul1-4/+4
2008-07-08added more Makefiles to file listBrian Paul1-0/+2
2008-07-08added src/mesa/drivers/Makefile to file listBrian Paul1-0/+1
2008-07-08mesa: bump version to rc2Brian Paul1-4/+4
2008-06-27DRI-specific pkg-config fileDan Nicholson1-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.
2008-06-10Distribute version.mk in case autoconf needs to be run againDan Nicholson1-0/+1
Users may need to rebuild the configure script, so we need to distribute version.mk so autoconf can run successfully.
2008-05-27prep for 7.1 RC1Brian Paul1-4/+4
2008-05-23drop GLcoreGeorge Sapountzis1-9/+1
2008-05-23mesa: Added linux-egl target, that only builds the i915simple driver and egl ↵Jakob Bornecrantz1-0/+1
drivers
2008-05-09autoconf: Attempt to figure out the PIC flags for the platformDan Nicholson1-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.
2008-05-07Never fail `make clean'Dan Nicholson1-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.
2008-05-06Update make output for autoconf helpDan Nicholson1-1/+5
2008-05-06Always cleanup the makedepend backup filesDan Nicholson1-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.
2008-05-06Error consistently when running recursive makeDan Nicholson1-3/+3
When changing directories and running a sub-make, ensure that both the cd and make commands propagate errors to the parent make.
2008-05-06Add .PHONY targets to top Makefile for non-file targetsDan Nicholson1-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.
2008-04-25fix make tarballsGeorge Sapountzis1-11/+0
2008-04-23glcore: build from mesaGeorge Sapountzis1-0/+7
2008-03-10Darwin: Config/source fixes to now build glxdemo apps and OSMesaJeremy Huddleston1-1/+2
Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config (cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)
2008-02-18Add an "all" target alias for "default" target.José Fonseca1-0/+2
"all" is more commonly expected, expecially by many IDEs.
2008-02-17Distribute dri_sarea.h with the tarballsDan Nicholson1-0/+1
The GL/internal/dri_sarea.h header was missing from the tarballs, causing the build to bomb for DRI2.
2008-01-23Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>)Brian1-0/+1
2007-12-07autoconf: Include necessary files for the tarballsDan Nicholson1-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.
2007-12-07autoconf: Initial support for an autoconf configurationDan Nicholson1-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.
2007-12-02Initial Cell driver infrastructure.Brian1-0/+1
No real code yet. Just stand-ins and make/build infrastructure.
2007-11-12add glw.pc.in to tarball list, remove from DEPEND_FILESBrian1-1/+1
2007-10-24added catamount-osmesa-pgi configAlex Neundorf1-0/+1
2007-10-24Introduce linux-llvm target. Remove the llvm code from the default build for ↵Zack Rusin1-0/+1
now. Cleanup some of the debugging output.
2007-10-23add directfb glut sources to tarballBrian1-0/+3
2007-09-28Update x86's static and profile configs.José Fonseca1-0/+2
2007-09-21Fix the doxygen target in the top-level Makefile.José Fonseca1-1/+4
2007-09-20fixes for bluegene-xlc-osmesa configBrian1-0/+1
2007-09-19Update linux-profile config.José Fonseca1-0/+1
2007-09-13added .pc.in files to tarballsBrian1-0/+4
2007-08-07remove SHELL line, replace -e test with new logic (Daniel Stone)Brian1-3/+1
2007-08-07Gutsy oopses on touch of existing file. Workaround.Keith Whitwell1-5/+3
2007-08-02fix missing backslashBrian1-1/+1
2007-08-02added bluegene-osmesaBrian1-0/+1
2007-07-31added sunos5-v9-cc-g++ configBrian1-0/+3
2007-07-21Fix a number of MINGW32 issuesZhang1-0/+1
2007-07-21remove VC6/VC7 project files until updatedBrian1-11/+0
2007-07-04add fbdev/ to DEMO_FILESBrian1-0/+2