summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* automake: Move top-level makefile to automake.Eric Anholt2012-06-111-156/+0
| | | | | | | | | This is part of a series to fix our build issues in the automake case by hooking up the automatic Makefile regeneration support. The extract_git_sha1 is moved into src/mesa/Makefile so that we get correct dependency generation. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* automake: Remove the old static configs system.Eric Anholt2012-06-111-116/+1
| | | | | | | With the incremental automake conversion, we'd broken those that included glx or egl. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* glsl: Convert the tests directory to automake.Eric Anholt2012-04-191-1/+1
| | | | | | | | | | | This runs optimization-test and produces the usual automake test output, which may be interesting to automated build systems. This doesn't convert the tests to be individually exposed to the automake runner, because automake doesn't like wildcards (due to being nonportable in make, not that we care). Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* makefile: add phony am--refresh targetDave Airlie2012-03-251-1/+3
| | | | | | | | | | for some reason when I configure --with-dri-drivers="" the src/mesa/drivers/dri Makefile tries to call the am--refresh target in the toplevel Makefile, we don't have one, and I'm not sure what it should look like. This makes things continue on. Signed-off-by: Dave Airlie <airlied@redhat.com>
* mesa: Include mesa ES mapi generated filesJakob Bornecrantz2012-03-211-0/+6
| | | | | Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> (cherry picked from commit 770f785a6f30e5295ababe44a8e9449ee0be640a)
* Bump version to 8.1 (devel)Ian Romanick2012-02-101-1/+1
| | | | Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
* Revert "glsl: Fix optimization tests after converting src/glsl to automake."Matt Turner2012-01-311-1/+0
| | | | This reverts commit ffe376d5a74dee837dc1a421de29ae551087630f.
* glsl: Fix optimization tests after converting src/glsl to automake.Paul Berry2012-01-311-0/+1
| | | | | | | | | | | | | Commit 99476561 (automake: src/glsl and src/glsl/glcpp) changed the build system so that src/glsl/glsl_test is not built by default. This inadvertently broke "make check", since the tests in src/glsl/tests/lower_jumps (which are run by "make check") rely on glsl_test. This patch ensures that "make check" builds glsl_test before running any tests. Reviewed-by: Matt Turner <mattst88@gmail.com>
* mesa: Include glx tests Makefile.in in tarball8.0-branchpointJakob Bornecrantz2012-01-121-0/+2
| | | | | | | Fix suggested by Kenneth Graunke. Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Kenneth Graunke <kenneth@whitescape.org>
* mesa: Bump version to 8.0 (devel)Kenneth Graunke2012-01-091-1/+1
| | | | | | | Also update the release notes to mention that Mesa 8.0 implements OpenGL 3.0. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
* tests/glx: Add unit tests for GLX_ARB_create_context GLX protocolIan Romanick2012-01-021-1/+1
| | | | | | | | | | This adds a new tests directory at the top-level and some extra build infrastructure. The tests use the Google C++ Testing Framework, and they will only be built if configure can detect its availability. The tests are automatically wired-in to run with 'make check'. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Chad Versace <chad.versace@linux.intel.com>
* gallium/cell: Remove the driver.Kai Wasserbäch2011-11-291-2/+0
| | | | | | | Complicates Gallium3D development and doesn't seem to have active users. Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org> Signed-off-by: José Fonseca <jfonseca@vmware.com>
* mesa: Remove support for BeOSIan Romanick2011-08-261-1/+0
| | | | | | | | | | Acked-by: Kristian Høgsberg <krh@bitplanet.net> Acked-by: Marek Olšák <maraeo@gmail.com> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Jakob Bornecrantz <jakob@vmware.com> Acked-by: Dave Airlie <airlied@redhat.com> Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com> Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
* glsl: Add unit tests for lower_jumps.cppPaul Berry2011-07-221-1/+5
| | | | | | | | | | | | | | These tests invoke do_lower_jumps() in isolation (using the glsl_test executable) and verify that it transforms the IR in the expected way. The unit tests may be run from the top level directory using "make check". For reference, I've also checked in the Python script create_test_cases.py, which was used to generate these tests. It is not necessary to run this script in order to run the tests. Acked-by: Chad Versace <chad@chad-versace.us>
* mesa: remove depend files from tarballsBrian Paul2011-07-191-14/+2
|
* make: Fix program/lex.yy.c & friends generation.José Fonseca2011-07-141-1/+1
| | | | | Not sure how this ever worked before, given that the Makefile is in src/mesa, not src/mesa/program.
* Squashed commit of the following:José Fonseca2011-07-141-314/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1856230d9fa61710cce3e152b8d88b1269611a73 Author: José Fonseca <jose.r.fonseca@gmail.com> Date: Tue Jul 12 23:41:27 2011 +0100 make: Use better var names on packaging. commit d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c Author: José Fonseca <jose.r.fonseca@gmail.com> Date: Tue Jul 12 23:38:21 2011 +0100 make: Apply several of Dan Nicholson's suggestions. commit f27cf8743ac9cbf4c0ad66aff0cd3f97efde97e4 Author: José Fonseca <jose.r.fonseca@gmail.com> Date: Sat Jul 9 14:18:20 2011 +0100 make: Put back the tar.bz2 creation rule. Removed by accident. commit 34983337f9d7db984e9f0117808274106d262110 Author: José Fonseca <jose.r.fonseca@gmail.com> Date: Sat Jul 9 11:59:29 2011 +0100 make: Determine tarballs contents via git ls-files. The wildcards were a mess: - lots of files for non Linux platforms missing - several files listed and archived twice Using git-ls-files ensures things are not loss when making the tarballs. commit 34a28ccbf459ed5710aafba5e7149e8291cb808c Author: José Fonseca <jose.r.fonseca@gmail.com> Date: Sat Jul 9 11:07:14 2011 +0100 glut: Remove GLUT source. Most distros ship freeglut, and most people don't care one vs the other, and it hasn't been really maintained. So it is better to have Mesa GLUT be revisioned and built separately from Mesa. commit 5c26a2c3c0c7e95ef853e19d12d75c4f80137e7d Author: José Fonseca <jose.r.fonseca@gmail.com> Date: Sat Jul 9 10:31:02 2011 +0100 Ignore the tarballs. commit 26edecac589819f0d0efe2165ab748dbc4e53394 Author: José Fonseca <jose.r.fonseca@gmail.com> Date: Sat Jul 9 10:30:24 2011 +0100 make: Create the Mesa-xxx-devel symlink automatically. Also actually remote the intermediate uncompressed tarballs.
* mesa: bump version to 7.12 (devel)Brian Paul2011-06-291-1/+1
|
* Add gbm (generic/graphics buffer manager)Benjamin Franzke2011-06-231-0/+11
|
* mesa: add missing DRI Makefiles to tarballThierry Vignaud2011-06-221-2/+1
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* mesa: add include/c99/*.h files to tarballsBrian Paul2011-06-081-0/+1
| | | | | | See https://bugs.freedesktop.org/show_bug.cgi?id=36238 NOTE: This is a candidate for the 7.10 branch.
* apple: Dead code removalJeremy Huddleston2011-06-071-9/+1
| | | | | | Now that we're using glapi, all of this is no longer needed. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
* Add intel pci id listsBenjamin Franzke2011-06-071-0/+1
| | | | Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
* apple: Package applegl source into MesaLib tarballJeremy Huddleston2011-06-061-0/+12
| | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
* Fiuxp make tarballs for wayland-egl/drmBenjamin Franzke2011-05-311-0/+2
|
* mesa: fix tarball creationThierry Vignaud2011-04-291-1/+1
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* Makefile: add missing Scons filesBrian Paul2011-04-191-0/+15
|
* Makefile: add missing .cpp, .ll, .yy filesThierry Vignaud2011-04-191-0/+3
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* Fix mesa tarball creation againThierry Vignaud2011-04-181-1/+0
| | | | Signed-off-by: Marek Olšák <maraeo@gmail.com>
* mesa: Include GIT SHA1 in GL version stringIan Romanick2011-04-051-0/+4
| | | | | | Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
* Generate lexer and parser files for tarball creation processIan Romanick2011-03-011-4/+10
|
* mesa: Fix some quirkiness of make tarballsIan Romanick2011-03-011-29/+26
| | | | | | | Among other benefits, parallel makes now work. Since many people have parallel builds by default (via MAKEFLAGS environment variable), this sames some irritation at release time...when there's usually not any other irritation already.
* mesa: Remove nonexistent files from distribution listIan Romanick2011-03-011-3/+1
|
* mesa: omit VC8 project files from tarballBrian Paul2011-01-281-2/+1
|
* Fix missing files in Mesa tarballs.Thierry Vignaud2011-01-281-0/+1
| | | | Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
* mesa: bump version to 7.11Vinson Lee2011-01-051-1/+1
|
* Makefile: don't include the same files twice in the tarballJulien Cristau2010-11-151-5/+1
| | | | | | | | | | | src/mesa/drivers/dri/*/*/*.[chS] is a superset of src/mesa/drivers/dri/*/server/*.[ch] and src/mesa/drivers/dri/common/xmlpool/*.[ch]. include/GL/internal/glcore.h is already in MAIN_FILES, no need for it in DRI_FILES too. src/glx/Makefile was listed twice. Signed-off-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Brian Paul <brianp@vmware.com>
* Makefile: ensure Gallium's Makefile.xorg and SConscript.dri are in the tarballMarek Olšák2010-09-291-0/+2
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* dri: Ensure that DRI driver cpp files are in tarballsIan Romanick2010-09-271-0/+1
|
* mesa: bump version to 7.10Vinson Lee2010-09-171-1/+1
|
* Add missing files to the tarball file lists.Chia-I Wu2010-09-121-1/+6
|
* mesa: remove non-existant files from tarball listBrian Paul2010-08-241-5/+0
|
* Remove remnants of the old glsl compiler.Eric Anholt2010-08-201-7/+5
|
* mesa: rename src/mesa/shader/ to src/mesa/program/shader-file-reorgBrian Paul2010-06-101-3/+3
|
* mesa: move shader/slang/* sources to main/slang/*Brian Paul2010-06-101-4/+4
| | | | Reduce the source tree depth a bit.
* glew: Drop glew now that we don't need it for the progsJakob Bornecrantz2010-06-081-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Remove last bits of progs/ infrastructureKristian Høgsberg2010-06-071-4/+0
|
* mesa: remove old references to demo files and progs subdirBrian Paul2010-06-041-64/+6
|
* progs: Remove remaining EGL demos.Chia-I Wu2010-05-211-12/+0
| | | | They have been moved to git+ssh://git.freedesktop.org/git/mesa/demos.
* Update file list for the tarballs.Chia-I Wu2010-05-081-23/+35
| | | | | | | 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.
View Lorry Controller Status