summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-09 10:17:58 -0700
committerBrian Paul <brianp@vmware.com>2009-02-09 10:17:58 -0700
commitabbe96cb6e7581a52652030e40442b943a482840 (patch)
treee61a7e495e7990dc1a3e3fe497ae2f0f520debf1 /src/mesa
parent3c15e02783ed5e908d7668c39786337d62e51d12 (diff)
mesa: added new linux-gallium and linux-gallium-debug configs
Also, remove gallium-related things from configs/default. They're in linux-gallium now. So the default builds are the same as they have been for Mesa/master.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Makefile4
-rw-r--r--src/mesa/sources.mak28
2 files changed, 24 insertions, 8 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 552c20e0b9..22ef05c335 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -32,6 +32,10 @@ default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
libmesa.a: $(MESA_OBJECTS)
@ $(MKLIB) -o mesa -static $(MESA_OBJECTS)
+# Make archive of subset of core mesa object files for gallium
+libmesagallium.a: $(MESA_GALLIUM_OBJECTS)
+ @ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS)
+
# Make archive of gl* API dispatcher functions only
libglapi.a: $(GLAPI_OBJECTS)
@if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 8940670d5b..13ec1fa454 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -91,7 +91,7 @@ MATH_SOURCES = \
math/m_vector.c \
math/m_xform.c
-__SWRAST_SOURCES = \
+SWRAST_SOURCES = \
swrast/s_aaline.c \
swrast/s_aatriangle.c \
swrast/s_accum.c \
@@ -122,11 +122,11 @@ __SWRAST_SOURCES = \
swrast/s_triangle.c \
swrast/s_zoom.c
-__SWRAST_SETUP_SOURCES = \
+SWRAST_SETUP_SOURCES = \
swrast_setup/ss_context.c \
swrast_setup/ss_triangle.c
-__TNL_SOURCES = \
+TNL_SOURCES = \
tnl/t_context.c \
tnl/t_pipeline.c \
tnl/t_draw.c \
@@ -162,7 +162,7 @@ VBO_SOURCES = \
vbo/vbo_save_draw.c \
vbo/vbo_save_loopback.c
-__VF_SOURCES = \
+VF_SOURCES = \
vf/vf.c \
vf/vf_generic.c \
vf/vf_sse.c
@@ -299,7 +299,7 @@ SPARC_SOURCES = \
SPARC_API = \
sparc/glapi_sparc.S
-__COMMON_DRIVER_SOURCES = \
+COMMON_DRIVER_SOURCES = \
drivers/common/driverfuncs.c
@@ -310,19 +310,27 @@ MESA_SOURCES = \
$(MAIN_SOURCES) \
$(MATH_SOURCES) \
$(VBO_SOURCES) \
- $(STATETRACKER_SOURCES) \
$(TNL_SOURCES) \
$(SHADER_SOURCES) \
$(SWRAST_SOURCES) \
$(SWRAST_SETUP_SOURCES) \
+ $(COMMON_DRIVER_SOURCES)\
$(ASM_C_SOURCES) \
$(SLANG_SOURCES)
ALL_SOURCES = \
$(MESA_SOURCES) \
$(GLAPI_SOURCES) \
- $(MESA_ASM_SOURCES) \
- $(COMMON_DRIVER_SOURCES)
+ $(MESA_ASM_SOURCES)
+
+MESA_GALLIUM_SOURCES = \
+ $(MAIN_SOURCES) \
+ $(MATH_SOURCES) \
+ $(VBO_SOURCES) \
+ $(STATETRACKER_SOURCES) \
+ $(SHADER_SOURCES) \
+ $(ASM_C_SOURCES) \
+ $(SLANG_SOURCES)
### Object files
@@ -331,6 +339,10 @@ MESA_OBJECTS = \
$(MESA_SOURCES:.c=.o) \
$(MESA_ASM_SOURCES:.S=.o)
+MESA_GALLIUM_OBJECTS = \
+ $(MESA_GALLIUM_SOURCES:.c=.o) \
+ $(MESA_ASM_SOURCES:.S=.o)
+
GLAPI_OBJECTS = \
$(GLAPI_SOURCES:.c=.o) \
$(GLAPI_ASM_SOURCES:.S=.o)