summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2010-01-07makefile: added src/glsl/Makefile.template to tarball listBrian Paul1-0/+1
2009-12-22Merge branch 'i965g-restart'Keith Whitwell1-0/+1
Conflicts: configure.ac
2009-12-21Merge branch 'mesa_7_7_branch'Brian Paul1-1/+1
Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
2009-12-21Merge commit 'origin/master' into i965g-restartKeith Whitwell1-5/+2
Conflicts: SConstruct configs/default configs/linux-dri
2009-12-12Remove grammar module -- no dependencies left.glsl-pp-rework-2Michal Krol1-1/+0
2009-12-12Merge branch 'master' into glsl-pp-rework-2Michal Krol1-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
2009-12-10Build mesa glsl with make.michal1-0/+4
Still don't know how to add glsl to mesa dependencies.
2009-12-07mesa: set version string to 7.7-rc1mesa_7_7_rc2Ian Romanick1-1/+1
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 Romanick1-5/+2
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 Paul1-5/+2
Only VC8 project file is known to work.
2009-11-04i965g: add standalone xlib debug winsysKeith Whitwell1-0/+1
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 Paul1-11/+11
2009-10-01mesa: add progs/objviewer to tarball listBrian Paul1-0/+6
2009-09-29mesa: bump version to 7.6.1Brian Paul1-1/+1
2009-09-28Prep for 7.6 releaseIan Romanick1-1/+1
2009-09-10Merge branch 'mesa_7_6_branch'Brian Paul1-0/+1
2009-09-09mesa: include new u_format.csv file in tarballsBrian Paul1-0/+1
2009-09-08mesa: bump version to 7.7Brian Paul1-1/+1
2009-08-24mesa: add new program parser sources to tarballBrian Paul1-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.
2009-08-14mesa: make sure r300/compiler/ sources are included in tarballThierry Vignaud1-0/+2
2009-08-13mesa: added *.shtest files to demo tarballBrian Paul1-0/+1
2009-07-28Merge branch 'mesa_7_5_branch'Brian Paul1-0/+10
Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h
2009-07-23mesa: include glew headers in MesaDemos tarballsBrian Paul1-0/+3
2009-07-22mesa: bump version to 7.5.1Brian Paul1-1/+1
2009-07-22mesa: include GLEW sources in MesaDemos tarballBrian Paul1-0/+7
2009-12-16mesa: set version string to 7.7-rc3mesa_7_7_rc3Ian Romanick1-1/+1
2009-07-17mesa: set version to 7.5Brian Paul1-1/+1
2009-06-26mesa: bump version to 7.5-rc4Brian Paul1-1/+1
2009-06-05mesa: bump version to 7.5-rc3mesa_7_5_rc3Brian Paul1-1/+1
2009-05-18Merge branch 'mesa_7_5_branch'Brian Paul1-0/+1
Conflicts: Makefile src/mesa/main/version.h
2009-05-18mesa: added linux-osmesa-static configBrian Paul1-0/+1
Contributed by Nicolas Noble. See SF bug #2792536
2009-05-15mesa: bump version to 7.5-rc2mesa_7_5_rc2Brian Paul1-1/+1
2009-05-11Merge branch 'mesa_7_5_branch'Brian Paul1-7/+1
Conflicts: Makefile src/mesa/main/version.h
2009-05-09mesa: added more gallium Makefiles to tarball listBrian Paul1-0/+1
2009-05-08mesa: omit files that were removed from gitmesa_7_5_rc1Brian Paul1-7/+0
2009-05-08mesa: set version to 7.5-rc1Brian Paul1-1/+1
2009-05-01mesa: bump version to 7.6 (devel)Brian Paul1-1/+1
2009-04-16mesa: add distclean target to top-level MakefileBrian Paul1-1/+4
2009-03-05mesa: add wglext.h to tarball listBrian Paul1-0/+1
2009-02-24mesa: added GLES 1/2 headers to tarball file listBrian Paul1-0/+2
2009-02-24mesa: add EGL headers to tarball listBrian Paul1-0/+1
2009-02-24mesa: add gallium and egl files to tarball listBrian Paul1-1/+32
2009-02-24mesa: remove removed VMS files from MakefileBrian Paul1-11/+0
I'll help Jouk restore these someday if he's still maintaining VMS support...
2009-02-24mesa: s/sources/sources.mak/ in MakefileBrian Paul1-1/+1
2009-02-10Revert "mesa: added new linux-gallium and linux-gallium-debug configs"Jakob Bornecrantz1-2/+0
This reverts commit abbe96cb6e7581a52652030e40442b943a482840. It only reverts parts of the commit the other parts where related to libmesagallium changes.
2009-02-09mesa: added new linux-gallium and linux-gallium-debug configsBrian Paul1-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.
2009-02-09mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul1-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
2009-02-06Revert "mesa: meaningless whitespace change to see if git's working (ignore)"Brian Paul1-1/+0
This reverts commit b2e779988eeb595187933fe2122d86f8ccfe059c. I didn't mean to push this stuff yet. I'm having a bad git day...
2009-02-06mesa: meaningless whitespace change to see if git's working (ignore)Brian Paul1-0/+1
2009-02-05mesa: remove oddball linux-directfb-install makefile ruleBrian Paul1-4/+0
It's probably not needed since the 'make install' rules were overhauled last year.