use ASM_API variable, bug 4415

[mesa.git] / src / mesa / sources

diff --git a/src/mesa/sources b/src/mesa/sources
index 422d563e1d5a5e872e1d3d9552db1f02c2d6d8f0..0756dd36f7bbc1c11313694689fa9f5622a1842e 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -16,7 +16,6 @@ MAIN_SOURCES = \
        main/convolve.c \
        main/debug.c \
        main/depth.c \
-       main/dispatch.c \
        main/dlist.c \
        main/drawpix.c \
        main/enable.c \
@@ -59,6 +58,7 @@ MAIN_SOURCES = \
        main/vtxfmt.c
 
 GLAPI_SOURCES = \
+       main/dispatch.c \
        glapi/glapi.c \
        glapi/glthread.c
 
@@ -121,6 +121,7 @@ TNL_SOURCES = \
        tnl/t_save_loopback.c \
        tnl/t_save_playback.c \
        tnl/t_vb_arbprogram.c \
+       tnl/t_vb_arbprogram_sse.c \
        tnl/t_vb_program.c \
        tnl/t_vb_render.c \
        tnl/t_vb_texgen.c \
@@ -188,6 +189,7 @@ SLANG_CPP_SOURCES = \
        
 SLANG_SOURCES =        \
        shader/slang/slang_assemble.c   \
+       shader/slang/slang_assemble_assignment.c        \
        shader/slang/slang_assemble_conditional.c       \
        shader/slang/slang_assemble_constructor.c       \
        shader/slang/slang_assemble_typeinfo.c  \
@@ -202,6 +204,7 @@ ASM_C_SOURCES =     \
        x86/x86.c \
        x86/3dnow.c \
        x86/sse.c \
+       x86/rtasm/x86sse.c \
        sparc/sparc.c \
        ppc/common_ppc.c \
        x86-64/x86-64.c
@@ -232,6 +235,9 @@ X86_API =                   \
 X86-64_SOURCES =               \
        x86-64/xform4.S
 
+X86-64_API =                   \
+       x86-64/glapi_x86-64.S
+
 SPARC_SOURCES =                        \
        sparc/clip.S            \
        sparc/norm.S            \
@@ -283,9 +289,8 @@ FBDEV_DRIVER_SOURCES =                      \
 
 ### All the core C sources
 
-CORE_SOURCES = \
+SOLO_SOURCES = \
        $(MAIN_SOURCES)         \
-       $(GLAPI_SOURCES)        \
        $(MATH_SOURCES)         \
        $(ARRAY_CACHE_SOURCES)  \
        $(TNL_SOURCES)          \
@@ -297,11 +302,22 @@ CORE_SOURCES = \
 
 #      $(SLANG_C_SOURCES)
 
+CORE_SOURCES = \
+       $(GLAPI_SOURCES)        \
+       $(SOLO_SOURCES)
+
 
 ### Object files
 
-#CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
-CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
+SOLO_OBJECTS = \
+       $(SOLO_SOURCES:.c=.o) \
+       $(ASM_SOURCES:.S=.o)
+
+GLAPI_OBJECTS = \
+       $(GLAPI_SOURCES:.c=.o) \
+       $(ASM_API:.S=.o)
+
+CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
 
 OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)