summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * mesa: Makefile commentBrian Paul2008-06-051-0/+1
| |
| * Update for llvm -> gallivm rename.José Fonseca2008-02-181-2/+2
| |
| * Code reorganization: split gallium and mesa makefiles.José Fonseca2008-02-181-67/+7
| | | | | | | | | | | | | | In other words, don't build src/gallium source code from within src/mesa/Makefile. Also, allow to customize which gallium auxiliary dirs, driver driver, winsys dirs get built from the config/* files.
| * Code reorganization: s/aux/auxiliary/ -- update build.José Fonseca2008-02-151-1/+1
| |
| * Code reorganization: update build.José Fonseca2008-02-151-9/+7
| | | | | | | | | | | | | | | | | | Update the Makefiles and includes for the new paths. Note that there hasn't been no separation of the Makefiles yet, and make is jumping all over the place. That will be taken care shortly. But for now, make should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm might require some minor tweaks.
| * Fix using "ccache ppu-gcc" for CC and fix parallel buildsIan Romanick2008-01-311-4/+5
| | | | | | | | | | CC wasn't quoted in a couple places in src/mesa/Makefile. Also, the OSMesa link was missing a dependency.
| * Specify linker instead of letting mklib use gccIan Romanick2008-01-231-0/+3
| | | | | | | | | | | | This is the final bit required to get Cell builds on x86 working. Without this, mklib tries to link using the x86 gcc instead of ppu32-gcc.
| * llvm: we need custom rules so had to redo the build a little bitZack Rusin2008-01-041-4/+7
| | | | | | | | also don't use sse when llvm is enabled
| * Port i965 driver to Gallium3D.Zack Rusin2007-12-111-3/+5
| | | | | | | | | | | | | | | | This is a squashed commit of i965 branch on ssh://people.freedesktop.org/~zack/mesa Because of the porting the branch often didn't compile so squashing it makes more sense. The port is still far from complete.
| * Add dependency checking for Cell driver sources.Brian2007-12-051-2/+3
| |
| * Initial Cell driver infrastructure.Brian2007-12-021-2/+7
| | | | | | | | No real code yet. Just stand-ins and make/build infrastructure.
| * LLVM requires linking with the C++ compiler.Michel Dänzer2007-10-251-5/+5
| | | | | | | | It's basically luck if it works with the C compiler on some platforms...
| * Cleanup some of the debugging output codeZack Rusin2007-10-241-1/+1
| |
| * Execution engine is a singleton, for now keep it in the pipe.Zack Rusin2007-10-241-3/+3
| |
| * Initial stab at LLVM integration.Zack Rusin2007-10-241-2/+2
| |
| * Hook up i915simple. Doesn't compile.Keith Whitwell2007-08-081-2/+2
| |
| * Workaround wierd oops on gutsy when building mesa.Keith Whitwell2007-08-031-1/+2
| |
| * Fix make recursion.Keith Whitwell2007-08-021-1/+2
| | | | | | | | Unfortunately means you can't just type make in softpipe any more.
| * Checkpoint: glClear changes - working, bug very rough.Brian2007-08-011-3/+6
| |
* | Fixed 'make install' for darwinJeremy Huddleston2008-08-121-2/+2
| |
* | Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson2008-07-121-2/+2
| | | | | | | | | | Respect the user's choice of shell when running mklib rather than always using /bin/sh.
* | Remove generated pkg-config files on `make clean'Dan Nicholson2008-07-111-0/+1
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 06:06:43 +0000