openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-02-17 16:39:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vl: Fix up configure.ac/Makefile

Browse Source
This commit is contained in:
Younes Manton 2010-04-24 13:52:23 -04:00
parent 5eb822cb6a
commit edca5360ca
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -1354,7 +1354,6 @@ if test "x$enable_gallium_nouveau" = xyes; then
fi
dnl
<<<<<<< HEAD
dnl Gallium G3DVL configuration
dnl
AC_ARG_ENABLE([gallium-g3dvl],
@ -1367,10 +1366,15 @@ if test "x$enable_gallium_g3dvl" = xyes; then
for dir in $GALLIUM_WINSYS_DIRS; do
vl_winsys_dirs="$vl_winsys_dirs g3dvl/$dir"
done
# Hack, g3dvl dri state tracker is in winsys/g3dvl/dri
# and needs to be built before the drm bits
if test "$mesa_driver" = dri; then
vl_winsys_dirs="g3dvl/dri $vl_winsys_dirs"
fi
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $vl_winsys_dirs"
fi
=======
dnl
dnl Gallium swrast configuration
dnl
AC_ARG_ENABLE([gallium-swrast],
@ -1384,7 +1388,6 @@ fi
dnl prepend CORE_DIRS to SRC_DIRS
SRC_DIRS="$CORE_DIRS $SRC_DIRS"
>>>>>>> origin/master
dnl Restore LDFLAGS and CPPFLAGS
LDFLAGS="$_SAVE_LDFLAGS"

2
src/gallium/winsys/g3dvl/drm/nouveau/Makefile
View File

@ -7,7 +7,7 @@ include $(TOP)/configs/current
C_SOURCES =
DRIVER_INCLUDES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-I) \
-I$(TOP)/src/gallium/winsys/drm/nouveau \
-I$(TOP)/src/gallium/winsys/drm/nouveau
DRIVER_DEFINES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-other)
PIPE_DRIVERS = \