diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 10 | ||||
| -rw-r--r-- | configs/default | 2 | ||||
| -rw-r--r-- | configs/linux-dri | 5 | ||||
| -rw-r--r-- | configs/linux-dri-x86-64 | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 4e931a3a9cc..58767273884 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -58,6 +58,10 @@ INSTALL = @INSTALL@ PYTHON2 = @PYTHON2@ PYTHON_FLAGS = -t -O -O +# Flex and Bison for GLSL compiler +FLEX = @FLEX@ +BISON = @BISON@ + # Library names (base name) GL_LIB = GL GLU_LIB = GLU @@ -172,6 +176,12 @@ DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@ # EGL driver install directory EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@ +# VDPAU library install directory +VDPAU_LIB_INSTALL_DIR=@VDPAU_LIB_INSTALL_DIR@ + +# VA library install directory +VA_LIB_INSTALL_DIR=@VA_LIB_INSTALL_DIR@ + # Xorg driver install directory (for xorg state-tracker) XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@ diff --git a/configs/default b/configs/default index 0582a0210af..b7acfd2f1a5 100644 --- a/configs/default +++ b/configs/default @@ -38,6 +38,8 @@ MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend MAKE = make +FLEX = flex +BISON = bison # Use MINSTALL for installing libraries, INSTALL for everything else MINSTALL = $(SHELL) $(TOP)/bin/minstall diff --git a/configs/linux-dri b/configs/linux-dri index 7ee007e3527..4f4b59dae9e 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -59,9 +59,10 @@ SRC_DIRS := glx egl $(SRC_DIRS) EGL_DRIVERS_DIRS = glx DRIVER_DIRS = dri + GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 -GALLIUM_TARGET_DIRS = -GALLIUM_STATE_TRACKERS_DIRS = egl +GALLIUM_TARGET_DIRS = egl-swrast +GALLIUM_STATE_TRACKERS_DIRS = egl vdpau DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \ savage sis tdfx unichrome swrast diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index 656cf6140d7..90e6c215adb 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64 # the new interface. i810 are missing because there is no x86-64 # system where they could *ever* be used. # -DRI_DIRS = i915 i965 mach64 mga r128 r200 r300 radeon savage tdfx unichrome +DRI_DIRS = swrast |