summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
2010-05-08Update file list for the tarballs.Chia-I Wu
Mainly for the recent work on mapi and gles. The latter adds some sources to src/mesa/main that are generated on the fly. This makes python a requirement for building Mesa. An alternative is to package those sources into the tarballs. That may be done in another commit.
2010-04-05mesa: added Makefile.egl to GALLIUM_FILESBrian Paul
2010-04-05mesa: add missing file to GALLIUM_FILESThierry Vignaud
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-04-01Update DEMO_FILES for demos using EGL.Chia-I Wu
Reflect the recent addtion of eglut and reorganization of the EGL demos. This helps remove ~2k lines of duplicated code $ git diff --shortstat -M 57cc1db87b5cacffd3344c49062c8289b7d46e78 18 files changed, 298 insertions(+), 2178 deletions(-)
2010-03-23Merge branch '7.8'Brian Paul
Conflicts: Makefile src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/intel/intel_blit.c src/mesa/drivers/dri/intel/intel_pixel_copy.c src/mesa/main/version.h
2010-03-23Add missing EGL files to the tarballs.Chia-I Wu
Add the Makefile of Gallium EGL drivers and demos using EGL to the tarballs.
2010-03-22mesa: set version string to 7.8-rc2Ian Romanick
2010-03-17Merge branch '7.8' into masterPauli Nieminen
Conflicts: Makefile src/mesa/main/version.h
2010-03-16Remove nonexistant files from tarballs rule of MakefileIan Romanick
The Makefile should eventually be fixed to stop building tarballs if one of the individual calls to tar fails.
2010-03-16mesa: set version string to 7.8-rc1Ian Romanick
2010-03-06include/GL: drop more deprecated headersGeorge Sapountzis
2010-03-05mesa: bump version to 7.9Brian Paul
Now that the 7.8 branch has been created Mesa/master will be version 7.9
2010-02-26mesa: update tarball file list, bump version stringBrian Paul
2010-02-26drop header files and demos for dropped window systemsGeorge Sapountzis
2010-02-26drop linux-solo configsGeorge Sapountzis
2010-02-25Drop classic mesa svga driverKristian Høgsberg
2010-02-25Drop glide driverKristian Høgsberg
2010-02-25Remove GGI supportKristian Høgsberg
2010-02-25Remove dos driverKristian Høgsberg
2010-02-25Remove directfb supportKristian Høgsberg
2010-02-24glapi: fix es after mvGeorge Sapountzis
2010-02-14makefiles: Don't complaint about changing configs if the same one is reselected.José Fonseca
Otherwise it creates unnecessary pain when automating builds in a build server/farm.
2010-02-11mesa: remove darwin-x86ppc and dangling darwin refs in MakefileBrian Paul
2010-02-09Retire miniglx and move the actual glx code up to src/glxKristian Høgsberg
2010-01-31Merge remote branch 'origin/master' into lp-binningJosé Fonseca
Conflicts: Makefile src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/lp_flush.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/llvmpipe/lp_tile_cache.c src/mesa/state_tracker/st_cb_condrender.c
2010-01-12Merge branch 'master' into opengl-es-v2Chia-I Wu
Conflicts: src/mesa/main/dd.h
2010-01-08Merge remote branch 'origin/master' into lp-binningJosé Fonseca
Conflicts: src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/Makefile src/gallium/drivers/llvmpipe/SConscript src/gallium/drivers/llvmpipe/lp_bld_arit.c src/gallium/drivers/llvmpipe/lp_bld_flow.c src/gallium/drivers/llvmpipe/lp_bld_interp.c src/gallium/drivers/llvmpipe/lp_clear.c src/gallium/drivers/llvmpipe/lp_context.c src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/llvmpipe/lp_draw_arrays.c src/gallium/drivers/llvmpipe/lp_jit.c src/gallium/drivers/llvmpipe/lp_jit.h src/gallium/drivers/llvmpipe/lp_prim_vbuf.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_setup_point.c src/gallium/drivers/llvmpipe/lp_state.h src/gallium/drivers/llvmpipe/lp_state_blend.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_sampler.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_tex_cache.h src/gallium/drivers/llvmpipe/lp_tex_sample.h src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-01-07makefile: added src/glsl/Makefile.template to tarball listBrian Paul
2010-01-05Clean up ES_FILES.Chia-I Wu
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-12-22Merge branch 'i965g-restart'Keith Whitwell
Conflicts: configure.ac
2009-12-21Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
2009-12-21Merge commit 'origin/master' into i965g-restartKeith Whitwell
Conflicts: SConstruct configs/default configs/linux-dri
2009-12-18llvmpipe: added linux-llvm-debug configurationBrian Paul
2009-12-12Remove grammar module -- no dependencies left.Michal Krol
2009-12-12Merge branch 'master' into glsl-pp-rework-2Michal Krol
Conflicts: progs/perf/drawoverhead.c progs/perf/teximage.c progs/perf/vbo.c progs/perf/vertexrate.c src/mesa/shader/slang/library/slang_common_builtin_gc.h
2009-12-10Build mesa glsl with make.michal
Still don't know how to add glsl to mesa dependencies.
2009-12-07mesa: set version string to 7.7-rc1Ian Romanick
Also modify the Makefile to use the correct version for the tarballs.
2009-11-30Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
2009-11-19mesa: omit VC6, VC7 project files from tarballsBrian Paul
Only VC8 project file is known to work.
2009-11-06Add new config for OpenGL ES.Chia-I Wu
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-05mesa/es: Add OpenGL ES overlay.Chia-I Wu
This is primitive support for OpenGL ES. It uses a subset of mesa sources to build libesXgallium.a and libesXapi.a, where X is 1 for OpenGL ES 1.x, 2 for OpenGL ES 2.x. The static libraries serve the same purpose as libmesagallium.a and libglapi.a do for OpenGL. This is based on the work of opengl-es branch. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-04i965g: add standalone xlib debug winsysKeith Whitwell
Create a dummy winsys that just debug-prints on calls into the winsys functions. Will use this to get to the point where we are generating sane-looking debug dumps and diassembly. Also fix various warnings generated with the new compiler flags set in this config.
2009-10-14mesa: assorted top-level Makefile clean-upsBrian Paul
2009-10-01mesa: add progs/objviewer to tarball listBrian Paul
2009-09-29mesa: bump version to 7.6.1Brian Paul
2009-09-28Prep for 7.6 releaseIan Romanick
2009-09-10Merge branch 'mesa_7_6_branch'Brian Paul
2009-09-09mesa: include new u_format.csv file in tarballsBrian Paul
2009-09-08mesa: bump version to 7.7Brian Paul
2009-08-24mesa: add new program parser sources to tarballBrian Paul
The end user doesn't need the .y or .l or Makefile but include them anyway in case someone wants to patch or debug things.