summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Remove grammar module -- no dependencies left.glsl-pp-rework-2Michal Krol2009-12-121-1/+0
|
* Merge branch 'master' into glsl-pp-rework-2Michal Krol2009-12-121-17/+20
|\ | | | | | | | | | | | | | | | | 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
| * mesa: set version string to 7.7-rc1mesa_7_7_rc2Ian Romanick2009-12-071-1/+1
| | | | | | | | Also modify the Makefile to use the correct version for the tarballs.
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-11-301-5/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
| | * mesa: omit VC6, VC7 project files from tarballsBrian Paul2009-11-191-5/+2
| | | | | | | | | | | | Only VC8 project file is known to work.
| | * mesa: bump version to 7.6.1Brian Paul2009-09-291-1/+1
| | |
| | * Prep for 7.6 releaseIan Romanick2009-09-281-1/+1
| | |
| * | mesa: assorted top-level Makefile clean-upsBrian Paul2009-10-141-11/+11
| | |
| * | mesa: add progs/objviewer to tarball listBrian Paul2009-10-011-0/+6
| | |
* | | Build mesa glsl with make.michal2009-12-101-0/+4
|/ / | | | | | | Still don't know how to add glsl to mesa dependencies.
* | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-101-0/+1
|\ \ | |/
| * mesa: include new u_format.csv file in tarballsBrian Paul2009-09-091-0/+1
| |
* | mesa: bump version to 7.7Brian Paul2009-09-081-1/+1
|/
* mesa: add new program parser sources to tarballBrian Paul2009-08-241-1/+2
| | | | | 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.
* mesa: make sure r300/compiler/ sources are included in tarballThierry Vignaud2009-08-141-0/+2
|
* mesa: added *.shtest files to demo tarballBrian Paul2009-08-131-0/+1
|
* Merge branch 'mesa_7_5_branch'Brian Paul2009-07-281-0/+10
|\ | | | | | | | | | | | | | | | | Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h
| * mesa: include glew headers in MesaDemos tarballsBrian Paul2009-07-231-0/+3
| |
| * mesa: bump version to 7.5.1Brian Paul2009-07-221-1/+1
| |
| * mesa: include GLEW sources in MesaDemos tarballBrian Paul2009-07-221-0/+7
| |
| * mesa: set version to 7.5Brian Paul2009-07-171-1/+1
| |
| * mesa: bump version to 7.5-rc4Brian Paul2009-06-261-1/+1
| |
| * mesa: bump version to 7.5-rc3mesa_7_5_rc3Brian Paul2009-06-051-1/+1
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-05-181-0/+1
|\ \ | |/ | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h
| * mesa: added linux-osmesa-static configBrian Paul2009-05-181-0/+1
| | | | | | | | Contributed by Nicolas Noble. See SF bug #2792536
| * mesa: bump version to 7.5-rc2mesa_7_5_rc2Brian Paul2009-05-151-1/+1
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-05-111-7/+1
|\ \ | |/ | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h
| * mesa: added more gallium Makefiles to tarball listBrian Paul2009-05-091-0/+1
| |
| * mesa: omit files that were removed from gitmesa_7_5_rc1Brian Paul2009-05-081-7/+0
| |
| * mesa: set version to 7.5-rc1Brian Paul2009-05-081-1/+1
| |
* | mesa: bump version to 7.6 (devel)Brian Paul2009-05-011-1/+1
|/
* mesa: add distclean target to top-level MakefileBrian Paul2009-04-161-1/+4
|
* mesa: add wglext.h to tarball listBrian Paul2009-03-051-0/+1
|
* mesa: added GLES 1/2 headers to tarball file listBrian Paul2009-02-241-0/+2
|
* mesa: add EGL headers to tarball listBrian Paul2009-02-241-0/+1
|
* mesa: add gallium and egl files to tarball listBrian Paul2009-02-241-1/+32
|
* mesa: remove removed VMS files from MakefileBrian Paul2009-02-241-11/+0
| | | | I'll help Jouk restore these someday if he's still maintaining VMS support...
* mesa: s/sources/sources.mak/ in MakefileBrian Paul2009-02-241-1/+1
|
* Revert "mesa: added new linux-gallium and linux-gallium-debug configs"Jakob Bornecrantz2009-02-101-2/+0
| | | | | | | This reverts commit abbe96cb6e7581a52652030e40442b943a482840. It only reverts parts of the commit the other parts where related to libmesagallium changes.
* mesa: added new linux-gallium and linux-gallium-debug configsBrian Paul2009-02-091-0/+2
| | | | | | | Also, remove gallium-related things from configs/default. They're in linux-gallium now. So the default builds are the same as they have been for Mesa/master.
* mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-091-1/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
| * mesa: set version to 7.4 for mesa_7_4_branchBrian Paul2009-01-291-4/+4
| |
| * mesa: set version to 7.3Brian Paul2009-01-291-4/+4
| |
| * Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-221-12/+5
| |\ | | | | | | | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
| * \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-161-4/+4
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c
| * \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-141-7/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h
| * | | | mesa: 7.3-rc-1 Makefile changesBrian Paul2009-01-091-4/+4
| | | | |
| * | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c
| * \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-011-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| * \ \ \ \ \ Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-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
View Lorry Controller Status