From da4f933eb2544b62daf0b3c3bd8e16277dd64117 Mon Sep 17 00:00:00 2001 From: Brian Paul <brianp@vmware.com> Date: Wed, 11 Feb 2009 13:59:54 -0700 Subject: mesa: refactor MATH_SOURCES, remove Mesa x86 codegen from gallium build Omit math/m_xform.c from gallium builds since it's not used and it's the one place we were pulling in the Mesa x86 codegen which collides with gallium's x86 codegen. Can now omit ASM_C_SOURCES from gallium build too. --- src/mesa/sources.mak | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/mesa/sources.mak') diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index dfafbc982bf..1bd81506e01 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -88,7 +88,10 @@ MATH_SOURCES = \ math/m_eval.c \ math/m_matrix.c \ math/m_translate.c \ - math/m_vector.c \ + math/m_vector.c + +MATH_XFORM_SOURCES = \ + $(MATH_SOURCES) \ math/m_xform.c SWRAST_SOURCES = \ @@ -309,7 +312,7 @@ COMMON_DRIVER_SOURCES = \ MESA_SOURCES = \ $(MAIN_SOURCES) \ - $(MATH_SOURCES) \ + $(MATH_XFORM_SOURCES) \ $(VBO_SOURCES) \ $(TNL_SOURCES) \ $(SHADER_SOURCES) \ @@ -330,7 +333,6 @@ MESA_GALLIUM_SOURCES = \ $(VBO_SOURCES) \ $(STATETRACKER_SOURCES) \ $(SHADER_SOURCES) \ - $(ASM_C_SOURCES) \ $(SLANG_SOURCES) -- cgit v1.2.3