summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
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.
2009-08-14mesa: make sure r300/compiler/ sources are included in tarballThierry Vignaud
2009-08-13mesa: added *.shtest files to demo tarballBrian Paul
2009-07-28Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h
2009-07-23mesa: include glew headers in MesaDemos tarballsBrian Paul
2009-07-22mesa: bump version to 7.5.1Brian Paul
2009-07-22mesa: include GLEW sources in MesaDemos tarballBrian Paul
2009-12-16mesa: set version string to 7.7-rc3Ian Romanick
2009-07-17mesa: set version to 7.5Brian Paul
2009-06-26mesa: bump version to 7.5-rc4Brian Paul
2009-06-05mesa: bump version to 7.5-rc3Brian Paul
2009-05-18Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile src/mesa/main/version.h
2009-05-18mesa: added linux-osmesa-static configBrian Paul
Contributed by Nicolas Noble. See SF bug #2792536
2009-05-15mesa: bump version to 7.5-rc2Brian Paul
2009-05-11Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile src/mesa/main/version.h
2009-05-09mesa: added more gallium Makefiles to tarball listBrian Paul
2009-05-08mesa: omit files that were removed from gitBrian Paul
2009-05-08mesa: set version to 7.5-rc1Brian Paul
2009-05-01mesa: bump version to 7.6 (devel)Brian Paul
2009-04-16mesa: add distclean target to top-level MakefileBrian Paul
2009-03-05mesa: add wglext.h to tarball listBrian Paul
2009-02-24mesa: added GLES 1/2 headers to tarball file listBrian Paul