diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-01-24 22:05:33 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2006-01-24 22:05:33 +0000 |
| commit | 2e28f4104ddf94a8f9a70fe6b2a2a6859ffedc8f (patch) | |
| tree | 8f51bde8dc61f00bcfb971f81ec6533aa3cbc48e /GL/mesa | |
| parent | 0d9ed2624fe8fb95c57930da523351556ba11351 (diff) | |
Allow current trunk to build against Mesa trunk
Diffstat (limited to 'GL/mesa')
| -rw-r--r-- | GL/mesa/main/Makefile.am | 1 | ||||
| -rw-r--r-- | GL/mesa/shader/Makefile.am | 5 | ||||
| -rw-r--r-- | GL/mesa/swrast/Makefile.am | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index 3b8b26cb5..b212f78fa 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -34,6 +34,7 @@ nodist_libmain_la_SOURCES = accum.c \ convolve.c \ debug.c \ depth.c \ + depthstencil.c \ dlist.c \ drawpix.c \ enable.c \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index f3ad3d25e..d77ea5ef3 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -19,15 +19,14 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I.. \ -I$(top_srcdir)/hw/xfree86/os-support -nodist_libshader_la_SOURCES = arbfragparse.c \ +nodist_libshader_la_SOURCES = \ arbprogparse.c \ arbprogram.c \ - arbvertparse.c \ atifragshader.c \ nvfragparse.c \ nvprogram.c \ nvvertexec.c \ - nvvertparse.c \ + nvvertparse.c \ program.c \ shaderobjects.c \ shaderobjects_3dlabs.c diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index a67573047..2660cb21d 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -29,19 +29,17 @@ nodist_libswrast_la_SOURCES = s_aaline.c \ s_drawpix.c \ s_feedback.c \ s_fog.c \ - s_fragprog_to_c.c \ s_imaging.c \ s_lines.c \ s_logic.c \ s_masking.c \ s_nvfragprog.c \ - s_pixeltex.c \ s_points.c \ s_readpix.c \ s_span.c \ s_stencil.c \ - s_tcc.c \ + s_texcombine.c \ + s_texfilter.c \ s_texstore.c \ - s_texture.c \ s_triangle.c \ s_zoom.c |