diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
| commit | 87e3301533aa4d3e6e98db139887ebba3d217f7d (patch) | |
| tree | ad80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /configs/freebsd-dri | |
| parent | 49405c43f245d3b3ddd12e891413bf7ead23145c (diff) | |
| parent | 3320b1874e810583f95b93a89697b2955987b84f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/linux-dri
src/mesa/pipe/Makefile
Diffstat (limited to 'configs/freebsd-dri')
| -rw-r--r-- | configs/freebsd-dri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 402883d1de..67d253b869 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -36,7 +36,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11 # Directories -SRC_DIRS = glx/x11 mesa glu glut/glx glw +SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri |