diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-10-27 15:40:33 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-10-27 15:40:33 +1100 |
| commit | 70a06e03d45f3d2e1cd1d430ba83c4b22471373c (patch) | |
| tree | 399cc450107d78041a53b61773635560472ae08a /configs | |
| parent | 295d6f8e8f03192320aa8d4ed767427dd06071a5 (diff) | |
| parent | 02c9009bb842cd8a47bc36ea274ef54ff47e1528 (diff) | |
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/linux-cell | 2 | ||||
| -rw-r--r-- | configs/linux-dri | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/configs/linux-cell b/configs/linux-cell index 8d74ee469d..f68a6853c3 100644 --- a/configs/linux-cell +++ b/configs/linux-cell @@ -24,7 +24,7 @@ OPT_FLAGS = -O3 SDK = /opt/cell/sdk/usr -CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec \ +CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -std=c99 -mabi=altivec -maltivec \ -I. -I$(SDK)/include \ -DGALLIUM_CELL -DUSE_XSHM diff --git a/configs/linux-dri b/configs/linux-dri index eb6f307dac..6a61f0c8db 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -55,20 +55,15 @@ SRC_DIRS := glx/x11 egl $(SRC_DIRS) # Directories -ifeq ($(USING_EGL), 1) -SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw +SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw PROGRAM_DIRS = egl xdemos -else -SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw -PROGRAM_DIRS = xdemos -endif # EGL directories -EGL_DRIVERS_DIRS = demo dri xdri +EGL_DRIVERS_DIRS = demo glx DRIVER_DIRS = WINDOW_SYSTEM = dri -GALLIUM_WINSYS_DIRS = drm egl_xlib +GALLIUM_WINSYS_DIRS = drm # gamma are missing because they have not been converted to use the new # interface. |