summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-11 13:59:54 -0700
committerBrian Paul <brianp@vmware.com>2009-02-11 14:01:29 -0700
commitda4f933eb2544b62daf0b3c3bd8e16277dd64117 (patch)
treec0289c9d6ea0f56254c3af0ca47a2ce03867792d /src/mesa
parent2218592d47b963791105f5b8fa1a0b3f3a07f674 (diff)
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.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/sources.mak8
1 files changed, 5 insertions, 3 deletions
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)