diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
| commit | 72d7f8d5af476f12dc75eab4fa9d59364cbec190 (patch) | |
| tree | 1efac13a52811bfd28ae51538b15f87cbfaf8939 /mesalib/src/mesa/SConscript | |
| parent | a3d796bcc7de83fd88b42e09c6a82a8df4f9b836 (diff) | |
| parent | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (diff) | |
| download | vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.gz vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.bz2 vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'mesalib/src/mesa/SConscript')
| -rw-r--r-- | mesalib/src/mesa/SConscript | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript index 7688ce941..8f978097c 100644 --- a/mesalib/src/mesa/SConscript +++ b/mesalib/src/mesa/SConscript @@ -149,10 +149,6 @@ math_sources = [ 'math/m_xform.c', ] -math_xform_sources = [ - 'math/m_xform.c' -] - swrast_sources = [ 'swrast/s_aaline.c', 'swrast/s_aatriangle.c', @@ -306,7 +302,6 @@ program_sources = [ 'program/prog_parameter_layout.c', 'program/prog_print.c', 'program/prog_statevars.c', - 'program/prog_uniform.c', 'program/programopt.c', 'program/sampler.cpp', 'program/symbol_table.c', @@ -323,7 +318,6 @@ common_driver_sources = [ mesa_sources = ( main_sources + math_sources + - math_xform_sources + program_sources + vbo_sources + tnl_sources + |