summaryrefslogtreecommitdiff
path: root/configs/default
AgeCommit message (Collapse)AuthorFilesLines
2008-11-12Merge commit 'origin/gallium-0.1' into gallium-0.2Pekka Paalanen1-1/+1
* commit 'origin/gallium-0.1': Mesa: fix number of buffers in st_draw_vbo(). Nouveau: fix nv20_vertex_layout() Nouveau: update nv20 miptree according to nv40. Nouveau: build, link and use nv20. Nouveau: name replace for nv20. Nouveau: Rename nv20/ files as nv20. Nouveau: copy nv30_vertprog.c to nv20. Nouveau: start nv20 by copying the nv10 tree.
2008-11-08Nouveau: build, link and use nv20.Pekka Paalanen1-1/+1
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-09-12Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2Ben Skeggs1-1/+1
2008-09-12mesa: build gallium directories before core mesaKeith Whitwell1-1/+1
2008-09-12Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2Ben Skeggs1-1/+1
Conflicts: configs/linux-dri
2008-09-12Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs1-0/+4
2008-09-11Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell1-0/+4
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
2008-09-11define new APP_CC configuration variable for building apps/demos/testsBrian Paul1-0/+4
For Cell, need to use different compilers for the libraries vs. the demos/tests to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
2008-09-11Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane1-1/+1
gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell1-8/+20
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
2008-09-11Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs1-2/+1
Conflicts: configs/default
2008-08-26change MESA_MINOR to 3Brian Paul1-1/+1
2008-08-17consolidate intel directories.Alan Hourihane1-1/+0
we now have src/gallium/winsys/drm/intel/{common,dri,egl}
2008-08-17choose sane default for dri driver locationAlan Hourihane1-1/+1
2008-08-12Fixed 'make install' for darwinJeremy Huddleston1-0/+6
2008-07-23Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs1-0/+2
2008-07-21mesa: revert building glslcompiler by defaultBrian Paul1-1/+1
2008-07-18autoconf: Support Motif widgets in GLw with --enable-motifDan Nicholson1-0/+1
Add an --enable-motif option, which will enable the Motif widgets in libGLw and link it with libXm. The Motif installation information will be gathered from the motif-config script (this comes with LessTif) or fallback to the standard autoconf checks. To allow the location of the Motif headers to be set from configure, the default setting of -I/usr/include/Motif1.2 has been moved into configs/default and then passed to the Makefile through the MOTIF_CFLAGS variable.
2008-07-17mesa: build the stand-alone glslcompiler by default, update the docsBrian Paul1-1/+1
2008-07-13EGL: Only build EGL dri based drivers under linux-dri based configsJakob Bornecrantz1-0/+2
2008-07-14Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs1-1/+1
2008-07-12Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson1-0/+1
Respect the user's choice of shell when running mklib rather than always using /bin/sh.
2008-07-12Call minstall with $(SHELL) so the user controls the interpreterDan Nicholson1-1/+1
Running minstall directly means that /bin/sh is always used as hte interpreter. If the user needs or wants to use a different shell fo minstall, they can use the SHELL make variable.
2008-07-12Set $(SHELL) for all configsDan Nicholson1-0/+1
Most make implementations will use /bin/sh as the interpreter for commands and only use a different shell when the $(SHELL) make variable is set. This makes the setting explicit and allows $(SHELL) to be used in the commands themselves.
2008-07-10gallium: Re-order the GALLIUM_AUXILIARY_DIRS to satisfy dependencies on utilJakob Bornecrantz1-1/+1
2008-07-10gallium: re-order the GALLIUM_AUXILIARY_DIRS to satisfy .a interdependenciesBrian Paul1-1/+1
libutil.a and libtranslate.a depend on libcso_cache.a so put them in that order.
2008-07-08nv04.Stephane Marchesin1-1/+1
2008-07-06Set library and header installation directories from configurationDan Nicholson1-1/+3
Currently the installation directories for libraries and headers are resolved within the install commands. For instance, the libraries will be installed to $(INSTALL_DIR)/$(LIB_DIR). This limits the flexibility of the installation, such as when the libraries should be installed to a subdirectory like /usr/lib/tls. This adds the make variables $(INSTALL_LIB_DIR) and $(INSTALL_INC_DIR) to define the locations that the libraries and headers are installed. For the static configs, this resolves exactly as before to $(INSTALL_DIR)/include and $(INSTALL_DIR)/$(LIB_DIR). For autoconf, they are derived directly from the --libdir and --includedir settings.
2008-06-23Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs1-2/+3
Conflicts: configs/default
2008-06-06gallium: Only build intel_drm for linux-dri targetsJakob Bornecrantz1-1/+1
2008-06-06i915: Moved pipe_buffer and i915_winsys functions to a common folderJakob Bornecrantz1-0/+1
2008-06-05egl: build libEGL and softpipe_egl.so by defaultBrian Paul1-2/+2
2008-05-23drop GLcoreGeorge Sapountzis1-4/+0
2008-05-09Default DRI driver directory to match X.Org xserverDan Nicholson1-1/+1
Since the only valid consumer of the DRI drivers is the X.Org xserver, this changes the default DRI driver directory to match xorg-server: ${libdir}/dri. The old default of /usr/X11R6/modules/dri was wrong for nearly all current systems.
2008-05-05autoconf: Scrape the version from configs/defaultDan Nicholson1-0/+1
Added the make script version.mk to print the various version numbers from configs/default. This is used to substitute the version in autoconf rather than duplicating it in both places.
2008-05-05glcore: Set all external variables in configurationGeorge Sapountzis1-0/+3
based on patch by Dan Nicholson <dbn.lists@gmail.com>
2008-04-23Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1Ben Skeggs1-1/+1
2008-04-18gallium: reorder libs so that translate can see rtasmKeith Whitwell1-1/+1
2008-04-15gallium: add translate directoryKeith Whitwell1-1/+1
2008-03-15nv10.Stephane Marchesin1-1/+1
2008-03-13Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs1-1/+1
2008-03-10gallium: new surface/context tracker (sct) moduleBrian1-1/+1
Will be used for tracking the surfaces and textures which are bound/used by contexts.
2008-02-22nouveau: fix buildBen Skeggs1-1/+1
2008-02-19Simplify makefile boilerplate code.José Fonseca1-1/+1
Don't define ASM_SOURCES variable globally -- reserve that variable to be defined locally by makefiles, together with C_SOURCES and CPP_SOURCES.
2008-02-19Bring rtasm from mesa to gallium.José Fonseca1-1/+1
2008-02-18Code reorganization: split gallium and mesa makefiles.José Fonseca1-2/+10
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.
2008-02-15Code reorganization: update build.José Fonseca1-1/+1
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.
2008-02-12glapi: Use variable for indent and flagsDan Nicholson1-1/+3
Put the path to indent and the flags to call it with in configs/default rather than in the Makefile. This makes it easier to change the values globally.
2008-01-23Use HOST_CC for programs that will run on the build hostIan Romanick1-0/+1
2008-01-23Use EXTRA_LIB_PATH with *_LIB_DEPSIan Romanick1-6/+6
Make sure EXTRA_LIB_PATH is used with all the LIB_DEPS. Re-order some of the options and tweak the whitespace to make the various LIB_DEPS more readable. This makes building for Cell on x86 a bit easier and doesn't seem to effect other builds.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 09:54:04 +0000