summaryrefslogtreecommitdiffstats
path: root/configs/linux-osmesa16
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-02-16 16:30:22 +1100
committerBen Skeggs <[email protected]>2008-02-16 16:30:22 +1100
commit87e3301533aa4d3e6e98db139887ebba3d217f7d (patch)
treead80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /configs/linux-osmesa16
parent49405c43f245d3b3ddd12e891413bf7ead23145c (diff)
parent3320b1874e810583f95b93a89697b2955987b84f (diff)
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts: configs/linux-dri src/mesa/pipe/Makefile
Diffstat (limited to 'configs/linux-osmesa16')
-rw-r--r--configs/linux-osmesa162
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
index 1fb0186d315..9a527592f1d 100644
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa16.so
# Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = gallium mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =