summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* mesa: fix es1/2 build hopefullyDave Airlie2010-08-171-0/+8
| | | | needed to add cpp rules and includes properly for es1/es2
* Merge remote branch 'origin/master' into glsl2Eric Anholt2010-07-261-0/+7
|\ | | | | | | | | | | | | | | | | | | | | This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h
| * gallium: Fix build with llvm installed in non-standard locationChristopher James Halse Rogers2010-07-231-0/+7
| | | | | | | | | | | | | | | | | | | | The es1, es2 and gl state trackers include draw_pipe.h, which includes the llvm headers if MESA_LLVM is true, so we also need to add the llvm seachpaths. Similarly, gallivm and other gallium drivers need LLVM_CFLAGS to build when enabled. Also fix xorg drivers, they didn't include LDFLAGS.
| * mesa: move shader/slang/* sources to main/slang/*Brian Paul2010-06-101-2/+2
| | | | | | | | Reduce the source tree depth a bit.
* | glsl2: Start integrating ir_to_mesa.cpp into shader_api.hEric Anholt2010-06-251-0/+2
| | | | | | | | | | | | The compiler is now called by the driver, and generates program instructions. Parameter lists are still not set up, so the driver chokes on it shortly thereafter.
* | glsl2: Replace the GLSL compiler with the glsl2 project.Eric Anholt2010-06-241-9/+10
|/
* Update OpenGL ES headers.Chia-I Wu2010-05-311-2/+2
|
* mesa/es: Merge back to core mesa.Chia-I Wu2010-05-121-14/+90
| | | | | | With the omit list gone, there are not too many differences in building core mesa and ES overlay. Remove the mesa/es and build both of them in src/mesa/Makefile.
* mesa: Optimize get.c by using a table-driven approachKristian Høgsberg2010-05-111-6/+0
|
* mapi: Add install rules for OpenGL ES.Chia-I Wu2010-05-081-46/+0
| | | | Move the install rules for OpenGL ES from src/mesa/Makefile to mapi.
* glapi: Move to src/mapi/.Chia-I Wu2010-05-071-15/+4
| | | | Move glapi to src/mapi/{glapi,es1api,es2api}.
* Generate es glapi files when es1 or es2 is enabledKristian Høgsberg2010-05-031-1/+7
|
* Hook in install rules for es1 and es2Kristian Høgsberg2010-05-021-0/+6
|
* Add glesv2.pc and glesv1_cm.pc pkg-config files for ES 1 and 2Kristian Høgsberg2010-05-021-6/+22
|
* gles: Build libGLESv1_CM.so and libGLESv2.so from glapi filesKristian Høgsberg2010-04-281-0/+24
|
* configure.ac: Add options to enable GLES1/2 API supportKristian Høgsberg2010-04-281-0/+1
|
* mesa: Move get_es*.c to main/Kristian Høgsberg2010-04-271-0/+5
|
* mesa: Move api_exec_es*.c into mesa/mainKristian Høgsberg2010-04-271-0/+6
| | | | | This requires renaming a few functions to have unique names so that they can all live within the same driver.
* mesa: remove libmesagallium.a on make cleanMarcin Slusarz2010-02-271-1/+1
| | | | Signed-off-by: José Fonseca <[email protected]>
* mesa: silence mklib output for libglapi.c as for other targetsBrian Paul2010-02-181-1/+1
|
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-081-1/+1
|\ | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
| * mesa: Ensure libmesagallium.a is finished building before descendingDan Nicholson2010-01-081-1/+1
| | | | | | | | Signed-off-by: Dan Nicholson <[email protected]>
* | Merge branch 'master' into glsl-pp-rework-2Michal Krol2009-12-121-5/+1
|\| | | | | | | | | | | | | | | | | 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
| * glapi: Always build libglapi.a.Chia-I Wu2009-10-231-5/+1
| | | | | | | | | | | | | | | | This is made possible by making glapioffsets.h and glapidispatch.h internal headers of glapi. They should only be included indirectly through dispatch.h by mesa. Signed-off-by: Chia-I Wu <[email protected]>
* | mesa: added new libglslpp.a and libglslcl.a to libGL buildBrian Paul2009-12-101-5/+4
| |
* | Build mesa glsl with make.michal2009-12-101-4/+11
|/ | | | Still don't know how to add glsl to mesa dependencies.
* Use separate $(MINSTALL) for installing librariesDan Nicholson2009-06-011-2/+2
| | | | | | | | | | | | | The special feature of bin/minstall to copy symlinks is only ever needed when installing libraries which may have .so symlinks. All the headers and directories can use a normal install program. These two modes are separated as $(INSTALL) and $(MINSTALL) to allow the user (or autoconf) to override installing normal files as they please. An autoconf check for the install program has been added and will be used in preference to minstall when available. Fixes bug 16053.
* Use variable library name in pkg-config output.Tom Fogal2009-04-291-1/+2
| | | | | | | | | | | Previously the pkg-config output files would contain e.g. `-lGL' and `-lGLU', even if the user modified their configuration to build libraries with different names. This modifies the pkg-config inputs, and corresponding makery, so that modifying the output library name will cause the appropriate updated name to appear in the pkg-config `-l' option. Signed-off-by: Dan Nicholson <[email protected]>
* mesa: use @ to silence some Makefile outputBrian Paul2009-03-071-1/+1
|
* mesa: build/use libmesagallium.a for gallium buildsBrian Paul2009-02-091-1/+2
| | | | | This contains the core mesa code but excludes things not needed for gallium such as tnl/, swrast/, swrast_setup/, etc.
* mesa: added new linux-gallium and linux-gallium-debug configsBrian Paul2009-02-091-0/+4
| | | | | | | 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: remove redudant lines for libglapi.aBrian Paul2009-01-021-5/+1
|
* mesa: remove redundant Makefile linesBrian Paul2008-12-161-3/+1
|
* Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-151-4/+21
|\
| * Add OSMesa pkg-config fileDan Nicholson2008-12-141-3/+17
| | | | | | | | This makes the GLU .pc file a little simpler, too.
| * Add more package metadata to the pkg-config filesDan Nicholson2008-12-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The pkg-config files have been filled in more thoroughly to allow users to use mesa more effectively. By adding metadata to Requires.private, Libs.private and Cflags, we can ensure that all the libraries and headers will be found in all situations. However, the full substitutions are only done when using the configure script. This also fixes the glu pkg-config file to account for using GL or OSMesa. Fixes bug 18161.
* | mesa: use sources.mak -- need to figure out how to support non-gallium ↵Keith Whitwell2008-09-111-1/+1
| | | | | | | | builds also
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * mesa: Rename sources to sources.mak.José Fonseca2008-08-121-1/+1
| |
| * Don't make libmesa.a or libglapi.a depend on asm_subdirsBrian Paul2008-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the asm_subdirs target does not actually create a file, make will always consider that it needs to be rebuilt. If libmesa.a and libglapi.a have asm_subdirs as a prerequisite, then they will always need to be rebuilt, too. The correct order will be preserved by the default target, though. This should fix #16358. Conflicts: src/mesa/Makefile cherry-picked from master
| * Ensure all objects are built when installing DRIDan Nicholson2008-06-231-1/+1
| |
| * mesa: Fix libglapi.a build for driJakob Bornecrantz2008-06-131-2/+2
| |
| * gallium: another attempt at fixing libglapi.a compilation for DRI buildsBrian Paul2008-06-131-6/+5
| | | | | | | | If building for DRI, make a dummy/empty libglapi.a for now.
| * gallium: work-around glapi.c build problem for dri configsBrian Paul2008-06-101-4/+12
| |
| * add some missing rule dependenciesBrian Paul2008-06-101-3/+3
| |
| * s/SOLO/MESA/Brian Paul2008-06-091-2/+2
| |
| * mesa: sync up with latest Makefile changes on masterBrian Paul2008-06-061-79/+67
| |
| * sync up with Makefile changes on masterBrian Paul2008-06-051-20/+42
| |
| * Move construction of libOSMesa.so into src/mesa/drivers/osmesa/MakefileBrian Paul2008-06-051-28/+4
| | | | | | | | | | This removes some cruft from src/mesa/Makefile. Something similar could be done for stand-alone / Xlib-Mesa libGL...
| * mesa: always build libglapi.a, updated subdir, gl.pc rule code from masterBrian Paul2008-06-051-6/+16
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 16:50:47 +0000