KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: fix linux-dri and autogen builds since sw-api-2 merge

This commit is contained in:
Keith Whitwell 2010-03-11 14:43:00 +00:00
parent e4d10dada0
commit 51bff09f72
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/default
View File

@ -100,7 +100,7 @@ GALLIUM_DIRS = auxiliary drivers state_trackers
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = drm null xlib GALLIUM_WINSYS_DIRS = null xlib drm
GALLIUM_TARGET_DIRS = libgl-xlib GALLIUM_TARGET_DIRS = libgl-xlib
GALLIUM_WINSYS_DRM_DIRS = swrast GALLIUM_WINSYS_DRM_DIRS = swrast
GALLIUM_STATE_TRACKERS_DIRS = glx vega GALLIUM_STATE_TRACKERS_DIRS = glx vega

2
configs/linux-dri
View File

@ -58,7 +58,7 @@ PROGRAM_DIRS := egl $(PROGRAM_DIRS)
EGL_DRIVERS_DIRS = glx EGL_DRIVERS_DIRS = glx
DRIVER_DIRS = dri DRIVER_DIRS = dri
GALLIUM_WINSYS_DIRS = drm GALLIUM_WINSYS_DIRS = null xlib drm
GALLIUM_TARGET_DIRS = GALLIUM_TARGET_DIRS =
GALLIUM_WINSYS_DRM_DIRS = vmware intel i965 GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
GALLIUM_STATE_TRACKERS_DIRS = egl GALLIUM_STATE_TRACKERS_DIRS = egl

6
configure.ac
View File

@ -458,6 +458,7 @@ CORE_DIRS="glsl mesa"
SRC_DIRS="glew" SRC_DIRS="glew"
GLU_DIRS="sgi" GLU_DIRS="sgi"
GALLIUM_DIRS="auxiliary drivers state_trackers" GALLIUM_DIRS="auxiliary drivers state_trackers"
GALLIUM_TARGET_DIRS=""
GALLIUM_WINSYS_DIRS="" GALLIUM_WINSYS_DIRS=""
GALLIUM_WINSYS_DRM_DIRS="" GALLIUM_WINSYS_DRM_DIRS=""
GALLIUM_DRIVERS_DIRS="softpipe failover trace identity" GALLIUM_DRIVERS_DIRS="softpipe failover trace identity"
@ -467,11 +468,12 @@ case "$mesa_driver" in
xlib) xlib)
DRIVER_DIRS="x11" DRIVER_DIRS="x11"
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib" GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"
;; ;;
dri) dri)
SRC_DIRS="$SRC_DIRS glx" SRC_DIRS="$SRC_DIRS glx"
DRIVER_DIRS="dri" DRIVER_DIRS="dri"
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm" GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib drm"
;; ;;
osmesa) osmesa)
DRIVER_DIRS="osmesa" DRIVER_DIRS="osmesa"
@ -481,6 +483,7 @@ AC_SUBST([SRC_DIRS])
AC_SUBST([GLU_DIRS]) AC_SUBST([GLU_DIRS])
AC_SUBST([DRIVER_DIRS]) AC_SUBST([DRIVER_DIRS])
AC_SUBST([GALLIUM_DIRS]) AC_SUBST([GALLIUM_DIRS])
AC_SUBST([GALLIUM_TARGET_DIRS])
AC_SUBST([GALLIUM_WINSYS_DIRS]) AC_SUBST([GALLIUM_WINSYS_DIRS])
AC_SUBST([GALLIUM_WINSYS_DRM_DIRS]) AC_SUBST([GALLIUM_WINSYS_DRM_DIRS])
AC_SUBST([GALLIUM_DRIVERS_DIRS]) AC_SUBST([GALLIUM_DRIVERS_DIRS])
@ -1415,6 +1418,7 @@ echo ""
if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
echo " Gallium: yes" echo " Gallium: yes"
echo " Gallium dirs: $GALLIUM_DIRS" echo " Gallium dirs: $GALLIUM_DIRS"
echo " Target dirs: $GALLIUM_TARGET_DIRS"
echo " Winsys dirs: $GALLIUM_WINSYS_DIRS" echo " Winsys dirs: $GALLIUM_WINSYS_DIRS"
echo " Winsys drm dirs:$GALLIUM_WINSYS_DRM_DIRS" echo " Winsys drm dirs:$GALLIUM_WINSYS_DRM_DIRS"
echo " Driver dirs: $GALLIUM_DRIVERS_DIRS" echo " Driver dirs: $GALLIUM_DRIVERS_DIRS"