diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-07-14 01:14:52 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-07-14 01:14:52 +1000 |
| commit | d68a3ebf0e7e853cf9680ddbb095fffe7c0fb1f9 (patch) | |
| tree | e093bba7d7b0ff62e0a4f47bd622180e5cea1a22 /configs | |
| parent | 1d50e26f4afc0c7cdcd843a1336a90cdfc76765b (diff) | |
| parent | 6410e94b966148dde81b5121e53a250d7b530d91 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/default | 2 | ||||
| -rw-r--r-- | configs/linux-dri | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/configs/default b/configs/default index c1bc5fb01d..8c6ae84840 100644 --- a/configs/default +++ b/configs/default @@ -68,7 +68,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos # Gallium directories and -GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util +GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover GALLIUM_WINSYS_COMMON_DIRS = diff --git a/configs/linux-dri b/configs/linux-dri index 74f81bf83b..ae9098c493 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -46,18 +46,8 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ $(LIBDRM_LIB) -# This is now 0 by default since it seems to confuse the hell out of people -# and generate a lot of extra noise on bugzilla. If you need to build with -# EGL, do 'make linux-dri USING_EGL=1' - -USING_EGL=0 - # Directories -SRC_DIRS := glx/x11 $(SRC_DIRS) -ifeq ($(USING_EGL), 1) -SRC_DIRS := egl $(SRC_DIRS) -PROGRAM_DIRS = egl -endif +SRC_DIRS := glx/x11 egl $(SRC_DIRS) |