summaryrefslogtreecommitdiff
path: root/configs
AgeCommit message (Collapse)Author
2008-09-12Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2Ben Skeggs
2008-09-12mesa: build gallium directories before core mesaKeith Whitwell
2008-09-12Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2Ben Skeggs
Conflicts: configs/linux-dri
2008-09-12Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs
2008-09-11Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
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-11add gallium dirAlan Hourihane
winsys/common -> winsys/
2008-09-11define new APP_CC configuration variable for building apps/demos/testsBrian Paul
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 Hourihane
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 Whitwell
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 Skeggs
Conflicts: configs/default
2008-09-03cell: add -DDEBUG flag, fixes to Cell MakefilesBrian Paul
2008-09-03Cell: added linux-cell-debug configBrian Paul
linux-cell is now the optimized configuration. Remove some Cell-specific stuff from winsys/xlib/Makefile.
2008-08-26change MESA_MINOR to 3Brian Paul
2008-08-26cell: use SDK 3.0 by defaultBrian Paul
2008-08-17consolidate intel directories.Alan Hourihane
we now have src/gallium/winsys/drm/intel/{common,dri,egl}
2008-08-17choose sane default for dri driver locationAlan Hourihane
2008-08-12Removed broken/unsupported darwin-static configsJeremy Huddleston
Fixed typo in darwin config
2008-08-12Fixed 'make install' for darwinJeremy Huddleston
2008-08-12Apple: More cleanup of the darwin config in 7.1Jeremy Huddleston
2008-08-08Apple: Some changes to fix compilation problems on OSXJeremy Huddleston
2008-07-23Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs
2008-07-21mesa: revert building glslcompiler by defaultBrian Paul
2008-07-18autoconf: Support Motif widgets in GLw with --enable-motifDan Nicholson
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 Paul
2008-07-14nouveau: say goodbye to the old DRI driver...Stephane Marchesin
2008-07-13EGL: Only build EGL dri based drivers under linux-dri based configsJakob Bornecrantz
2008-07-14Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs
2008-07-12Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson
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 Nicholson
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 Nicholson
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-12autoconf: Subsitute SHELL for all platformsDan Nicholson
Establish the shell that make will use from configure. This is exactly how autoconf/automake operate, with the environment variable CONFIG_SHELL respected to override the autoconf checks. In the usual case where the user just executes `./configure', autoconf will pick a shell from the current shell, sh, bash, ksh or sh5 that meets its base criteria. The special Solaris case of looking for a POSIX shell has been changed to just set the SHELL variable since autoconf substitutes this already. The EXTRA_CONFIG_LINES substitution is dropped as it should no longer be needed.
2008-07-11build egl subdirsBrian Paul
2008-07-10gallium: Re-order the GALLIUM_AUXILIARY_DIRS to satisfy dependencies on utilJakob Bornecrantz
2008-07-10gallium: re-order the GALLIUM_AUXILIARY_DIRS to satisfy .a interdependenciesBrian Paul
libutil.a and libtranslate.a depend on libcso_cache.a so put them in that order.
2008-07-08nv04.Stephane Marchesin
2008-07-06Set library and header installation directories from configurationDan Nicholson
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 Skeggs
Conflicts: configs/default
2008-06-21Solaris port of Mesa 7.1 with autoconf supportAlan Coopersmith
Signed-off-by: Brian Paul <brian.paul@tungstengraphics.com>
2008-06-08mesa: Do not compile the dri drivers in mesaJakob Bornecrantz
2008-06-06gallium: Only build intel_drm for linux-dri targetsJakob Bornecrantz
2008-06-06i915: Moved pipe_buffer and i915_winsys functions to a common folderJakob Bornecrantz
2008-06-05build egl_xlib/ too (softpipe_egl.so library)Brian Paul
2008-06-05egl: build libEGL and softpipe_egl.so by defaultBrian Paul
2008-06-04Build with -O2Alan Hourihane
2008-05-25Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs
2008-05-23drop GLcoreGeorge Sapountzis
2008-05-23Merge branch 'gallium-i915-current' into gallium-0.1Jakob Bornecrantz
2008-05-23egl: Don't build EGL programs eitherJakob Bornecrantz
2008-05-23egl: Stoped compiling EGL completelyJakob Bornecrantz
2008-05-23mesa: Added linux-egl target, that only builds the i915simple driver and egl ↵Jakob Bornecrantz
drivers