diff options
author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
---|---|---|
committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
commit | e3ddafd1d32192f4638d4930627ad66624325561 (patch) | |
tree | d538b76af6c559593c6507ad7c2eb415d1b28c75 /configs/linux-dri | |
parent | 359058e7b77ddbac5eec7e8d1c77232bcbb1adbf (diff) | |
parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) |
Merge branch 'gallium-tex-surface' into gallium-0.1
Conflicts:
src/gallium/include/pipe/p_util.h
Diffstat (limited to 'configs/linux-dri')
-rw-r--r-- | configs/linux-dri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/linux-dri b/configs/linux-dri index 67e60cbd4c..cd82c571c7 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -59,8 +59,10 @@ SRC_DIRS := egl $(SRC_DIRS) PROGRAM_DIRS = egl endif + + DRIVER_DIRS = dri -WINDOW_SYSTEM=dri +WINDOW_SYSTEM = dri GALLIUM_WINSYS_DIRS = dri # gamma are missing because they have not been converted to use the new |