summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
2010-09-27dri: Ensure that DRI driver cpp files are in tarballsIan Romanick
2010-09-17mesa: bump version to 7.10Vinson Lee
2010-09-12Add missing files to the tarball file lists.Chia-I Wu
2010-08-24mesa: remove non-existant files from tarball listBrian Paul
2010-08-20Remove remnants of the old glsl compiler.Eric Anholt
2010-06-10mesa: rename src/mesa/shader/ to src/mesa/program/Brian Paul
2010-06-10mesa: move shader/slang/* sources to main/slang/*Brian Paul
Reduce the source tree depth a bit.
2010-06-08glew: Drop glew now that we don't need it for the progsJakob Bornecrantz
configs/beos | 2 +- configs/darwin | 2 +- configs/default | 4 +- configs/freebsd-dri | 2 +- configs/linux-cell | 2 +- configs/linux-dri-xcb | 2 +- configs/linux-indirect | 2 +- configure.ac | 2 +- include/GL/glew.h |14435 ------------------------------------------------ include/GL/glxew.h | 1476 ----- include/GL/wglew.h | 1247 ----- src/SConscript | 1 - src/glew/LICENSE.txt | 73 - src/glew/Makefile | 54 - src/glew/SConscript | 69 - src/glew/glew.c |14320 ----------------------------------------------- src/glew/glewinfo.c | 8441 ---------------------------- src/glew/visualinfo.c | 1173 ---- 18 files changed, 8 insertions(+), 41299 deletions(-) Revert "glew: update to version 1.5.4" This reverts commit a189b1c53b6a3b6c055cc86145c8ef48c580e9d0. Revert "glew: Include X11 headers and libraries in SCons build." This reverts commit efdd33985cb38429aeae845a556db2322957e71a. Revert "scons: Fix GLEW build on Mac OS X." This reverts commit 8f81769148eab0042ffb7192a702350275648715. Revert "scons: Use static glew library on Unices to avoid binary compatability issues" This reverts commit de22c940a1df66d13825dd15c015eafabb61a11d. Revert "glew: Update to version 1.5.2." This reverts commit aaf7ecfd816f82fef314f4f772cc53bc0ced553e. Revert "scons: Build glew on all platforms." This reverts commit 52eb3e4235cc661ab9626a704c555a5f096c628a. Revert "scons: Put glut and glew shared libraries into build/xxx/bin or lib." This reverts commit 8a318edd0838ee3343be0425019d93541b621567. Didn't revert scons/gallium.py Revert "scons: Fix glew build on MSVC." This reverts commit 14a8c9dac7ea43ad8a45052e17f7127451344e5a. Revert "scons: Build progs together with everything else." This reverts commit 7bbf7f94ea786e41ff1364cedaf7dd5c0bbf605a. Only changed src/glew/SConscript Revert "mesa: include glew headers in MesaDemos tarballs" This reverts commit c57d81ddc9ba3052ff7f6b72091accab2c2db0ae. Revert "mesa: include GLEW sources in MesaDemos tarball" This reverts commit b9e2e32daf5505896a662dc8df60104c0f51b4b9. Revert "glew: correct misspelling of glFramebufferTextureLayer" This reverts commit 1b05b5b4fecd9ac8ef34abdda6c085868016ad84. Revert "glew: fix GLEW_LIB_NAME" This reverts commit c10df26a31b6af5a720fbfd06411d580cd38a2c8. Revert "Add dummy install target for glew to fix 'make install'" This reverts commit c273dfe6a28d4bb64ce167685b4053d22db5a727. Revert "autoconf: Add GLEW needed by progs when building GLUT" This reverts commit 2977cee38e21b8e5ebba1635b101185d64ee44a9. Revert "glew: Build it as a static lib." This reverts commit fcf9353fea8343a1a86c8c6e0144c8429440c648. Revert "glew: Initial import." This reverts commit 57d00016cab9afa3e7853d9830044a8ece9541c4.
2010-06-07Remove last bits of progs/ infrastructureKristian Høgsberg
2010-06-04mesa: remove old references to demo files and progs subdirBrian Paul
2010-05-21progs: Remove remaining EGL demos.Chia-I Wu
They have been moved to git+ssh://git.freedesktop.org/git/mesa/demos.
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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 19:11:28 +0000