José Fonseca
7bbf7f94ea
scons: Build progs together with everything else.
...
This is a substantial reorganization, This particular commit enables:
- building the progs for unices platforms
- glew is now built as a shared library (it is the default, and it is
inconvenient and pointless to shift away from that default)
- all progs get built by default
2010-01-01 12:16:19 +00:00
Vinson Lee
07b54fe35b
progs/redbook: Silence compiler warnings.
2009-12-21 15:20:01 -08:00
Vinson Lee
9e2eee4ab2
progs/redbook: Silence compiler warnings in aaindex.c.
2009-12-12 01:02:16 -08:00
Vinson Lee
b210739aad
progs/redbook: Fix memory leak in quadric.c.
...
(cherry picked from commit 47b5f584a6
)
2009-12-03 23:12:59 -08:00
Keith Whitwell
fd402791f9
progs: add fflushes for cygwin
2009-04-28 18:15:17 +01:00
José Fonseca
8b9aa730c6
progs: Build rebook with scons too.
2009-02-10 20:18:52 +00:00
Keith Whitwell
cc7dd4fc1b
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
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-11 18:32:05 +01:00
Brian Paul
90c93bbeee
define new APP_CC configuration variable for building apps/demos/tests
...
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-11 11:00:54 -06:00
Keith Whitwell
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
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-11 16:05:15 +01:00
José Fonseca
fd6676c249
Fix CRLF line endings.
2008-06-24 22:26:19 +09:00
Dan Nicholson
c05aa5ec4c
specify app lib dependencies in Makefiles (patch 1/3)
2007-10-29 09:03:01 -06:00
Dan Nicholson
2a3e33865d
add support for LDFLAGS env var
2007-09-28 18:42:21 -06:00
Brian
e7e5279fc0
Remove unused Imakefiles.
2007-04-20 19:18:13 -06:00
Michel Dänzer
14f92636b0
Make git ignore files only generated at build time.
2006-12-06 14:17:56 +01:00
Brian Paul
883f9891cb
LIB_DIR is now just 'lib' or 'lib64'
...
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
2006-07-13 02:50:27 +00:00
Brian Paul
730fabd67a
fix some weirdness accidentally checked in in the past
2005-01-17 16:14:46 +00:00
Brian Paul
429efa9f00
animation rate patch (Marcello Magallon)
2005-01-09 16:52:53 +00:00
Keith Whitwell
a61ee65910
Redraw on keypress, as apparently intended.
2005-01-06 17:12:56 +00:00
Philippe Houdoin
789dd56699
Obsolete the BeOS-specific makefile as we now build using standard Makefiles chain.
2004-08-14 10:05:33 +00:00
Brian Paul
362f1df210
obsolete
2004-04-22 00:42:38 +00:00
Brian Paul
5c2040c768
minor fixes
2004-03-26 23:58:08 +00:00
Brian Paul
46727c7496
Tweaks for make clean / realclean.
2004-03-26 20:31:05 +00:00
Brian Paul
de0ee3187c
New Makefile system
2004-03-26 15:19:11 +00:00
Brian Paul
5fd77da4f6
improved 'clean' targets (Otto Solares)
2003-10-03 14:03:14 +00:00
Karl Schultz
77a505a4bb
MS dev studio project file for teapots demo.
2003-09-24 17:37:00 +00:00
Karl Schultz
c1cbde2ae1
Workspace file for redbook programs
2003-09-24 17:36:00 +00:00
Karl Schultz
2c9618bb12
Change projection transform so that the top row of teapots are now visible.
2003-09-24 17:34:32 +00:00
Brian Paul
044f20d1ea
files for CVS to ignore
2003-09-05 12:51:24 +00:00
Brian Paul
b953bebc25
updated old-style makefiles for new tree
2003-06-10 14:46:24 +00:00
Ian Romanick
9ac51f57ef
Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.
2003-06-05 00:50:18 +00:00
Brian Paul
3ba8a49c81
Remove a bunch of really old/obsolete configs.
...
Use the new mklib script.
2003-06-01 16:25:02 +00:00
Brian Paul
ff389b00a5
casts
2003-04-21 14:50:49 +00:00
Karl Schultz
53d30c56eb
Quiet compiler warnings.
2002-10-18 17:47:35 +00:00
Brian Paul
9d00b68482
added missing glFinish()
2002-10-15 14:44:53 +00:00
Brian Paul
f02a5f6cc5
Pedantic compiler fixes (Sven Panne)
2002-07-12 15:54:01 +00:00
Brian Paul
9ff74a0f15
undo some debug changes mistakenly checked in earlier
2002-02-17 17:37:55 +00:00
Brian Paul
38d042a4ad
silence compiler warnings
2002-02-12 16:07:47 +00:00
Karl Schultz
83356781e1
Removed missing files and added new ones (Robert Bergkvist)
2002-01-16 00:41:16 +00:00
Brian Paul
db6aa58267
patched to silence compiler warnings (Martin Lindhe)
2000-11-10 17:23:02 +00:00
Brian Paul
fda3b1a4b1
added comment explaining why the demo is flawed
2000-10-31 20:41:06 +00:00
Keith Whitwell
a179cbf0dd
Re-enable the keyboard functionality.
...
Add a -db option for doublebuffering.
Add a 'benchmark' keystroke like isosurf.
2000-06-14 23:24:50 +00:00
Brian Paul
8fbd189d81
added missing braces in initializers
2000-04-05 21:35:46 +00:00
Brian Paul
27be87cdff
new library dependency vars
2000-02-16 01:09:06 +00:00
Kendall Bennett
f945672623
. More fixed to
1999-11-12 16:38:23 +00:00
Brian Paul
37ff9433c0
added missing braces in array initializations
1999-11-11 14:37:24 +00:00
Brian Paul
0144a50f04
removed -lm from link command
1999-10-27 10:09:53 +00:00
Gareth Hughes
dcf11bdb93
Fixed overflow bug in combineCallback.
1999-10-03 01:00:33 +00:00
Ted Jump
725ec81ae8
More Win32 build compliance fixups
1999-09-19 02:03:18 +00:00
Ted Jump
83c02efa52
Added ESC key handling
1999-09-17 02:40:51 +00:00
Brian Paul
738e977580
link with -lGLU -lGL instead of -lMesaGLU -lMesaGL
1999-09-17 00:07:26 +00:00