diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-01-12 00:21:59 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-01-12 00:21:59 +0000 |
| commit | 847d83ec3c90c5b298eaf19ba55251b4a30f4155 (patch) | |
| tree | 92ad2d46a7d304e5c6362a79d571642bbb94d223 /GL/mesa | |
| parent | c56e9a8849ce8dd5c09732ae1860e409e7886690 (diff) | |
Bug #2996: libglx / libGLcore should use a dispatch table
Port all changes from the (monolithic) accelerated_indirect-0-0-1 branch to
the modular trunk. This will break the Darwin and cygwin builds. Other
than the changes to symlink-mesa.sh and the various Makefile.am files,
to code is identical to what's in the branch.
Reviewed by: airlied, krh
Diffstat (limited to 'GL/mesa')
| -rw-r--r-- | GL/mesa/Makefile.am | 5 | ||||
| -rw-r--r-- | GL/mesa/main/Makefile.am | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am index 72a7488eb..72b699476 100644 --- a/GL/mesa/Makefile.am +++ b/GL/mesa/Makefile.am @@ -1,10 +1,9 @@ -SUBDIRS = glapi main math array_cache swrast swrast_setup tnl shader X +SUBDIRS = main math array_cache swrast swrast_setup tnl shader X noinst_LTLIBRARIES = libGLcore.la libGLcore_la_SOURCES = dummy.c -libGLcore_la_LIBADD = glapi/libglapi.la \ - main/libmain.la \ +libGLcore_la_LIBADD = main/libmain.la \ math/libmath.la \ array_cache/libac.la \ swrast/libswrast.la \ diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index 31e5751c6..3b8b26cb5 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -34,7 +34,6 @@ nodist_libmain_la_SOURCES = accum.c \ convolve.c \ debug.c \ depth.c \ - dispatch.c \ dlist.c \ drawpix.c \ enable.c \ |