diff options
| author | Corbin Simpson <[email protected]> | 2009-02-06 13:34:04 -0800 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2009-02-06 13:34:04 -0800 |
| commit | 4683fc94f5e03f596fc8e5c12e9dd54a83deaeb9 (patch) | |
| tree | bf78732b3bc9b7b22d3e1074d1447ea5be77656f /configs | |
| parent | e6372853c221a5d64494ce75a6a323c479c55a86 (diff) | |
| parent | 80026428e3aa8f71ccd42d8d3b5e0a15c150dda2 (diff) | |
Merge branch 'gallium-0.2-radeon' into gallium-0.2
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 8 | ||||
| -rw-r--r-- | configs/default | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 4a89716ab60..a8970f7d652 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -55,11 +55,17 @@ LIB_DIR = @LIB_DIR@ SRC_DIRS = @SRC_DIRS@ GLU_DIRS = @GLU_DIRS@ DRIVER_DIRS = @DRIVER_DIRS@ +GALLIUM_AUXILIARY_DIRS = @GALLIUM_AUXILIARY_DIRS@ +GALLIUM_DRIVER_DIRS = @GALLIUM_DRIVER_DIRS@ +GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@ +GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) +GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) + # Which subdirs under $(TOP)/progs/ to enter: PROGRAM_DIRS = @PROGRAM_DIRS@ # Driver specific build vars -DRI_DIRS = @DRI_DIRS@ +#DRI_DIRS = @DRI_DIRS@ WINDOW_SYSTEM = @WINDOW_SYSTEM@ USING_EGL = @USING_EGL@ diff --git a/configs/default b/configs/default index 13bda58f188..cda9a5b0370 100644 --- a/configs/default +++ b/configs/default @@ -91,7 +91,7 @@ EGL_DRIVERS_DIRS = demo # Gallium directories and GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) -GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = xlib egl_xlib |