automake: src/mesa/drivers/dri/nouveau
This commit is contained in:
Matt Turner
parent
b38d7a0a24
commit
3f96434f86
|
|
@ -62,7 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm
|
|||
GALLIUM_TARGET_DIRS = dri-vmwgfx
|
||||
GALLIUM_STATE_TRACKERS_DIRS = egl dri
|
||||
|
||||
DRI_DIRS = nouveau swrast
|
||||
DRI_DIRS = swrast
|
||||
|
||||
INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
|
||||
INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
|
||||
|
|
|
|||
15
configure.ac
15
configure.ac
|
|
@ -1271,6 +1271,13 @@ case $DRI_DIRS in
|
|||
;;
|
||||
esac
|
||||
|
||||
case $DRI_DIRS in
|
||||
*nouveau*)
|
||||
PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
|
||||
HAVE_NOUVEAU_DRI=yes;
|
||||
;;
|
||||
esac
|
||||
|
||||
case $DRI_DIRS in
|
||||
*radeon*|*r200*)
|
||||
PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
|
||||
|
|
@ -1291,15 +1298,10 @@ esac
|
|||
|
||||
AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
|
||||
AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
|
||||
AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
|
||||
AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
|
||||
AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
|
||||
|
||||
case $DRI_DIRS in
|
||||
*nouveau*)
|
||||
PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl
|
||||
dnl OSMesa configuration
|
||||
dnl
|
||||
|
|
@ -1925,6 +1927,7 @@ dnl Substitute the config
|
|||
AC_CONFIG_FILES([configs/autoconf
|
||||
src/mesa/drivers/dri/i915/Makefile
|
||||
src/mesa/drivers/dri/i965/Makefile
|
||||
src/mesa/drivers/dri/nouveau/Makefile
|
||||
src/mesa/drivers/dri/r200/Makefile
|
||||
src/mesa/drivers/dri/radeon/Makefile
|
||||
tests/Makefile
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
.deps
|
||||
.libs
|
||||
Makefile
|
||||
Makefile.in
|
||||
nouveau_vieux_dri.la
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
|
||||
|
||||
# Copyright © 2012 Matt Turner <mattst88@gmail.com>
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the "Software"),
|
||||
# to deal in the Software without restriction, including without limitation
|
||||
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
# and/or sell copies of the Software, and to permit persons to whom the
|
||||
# Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice (including the next
|
||||
# paragraph) shall be included in all copies or substantial portions of the
|
||||
# Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
# IN THE SOFTWARE.
|
||||
|
||||
include Makefile.sources
|
||||
|
||||
# Hack to make some of the non-automake variables work.
|
||||
TOP=$(top_builddir)
|
||||
|
||||
AM_CFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/src/ \
|
||||
-I$(top_srcdir)/src/mapi \
|
||||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common \
|
||||
$(DEFINES) \
|
||||
$(ASM_FLAGS) \
|
||||
$(API_DEFINES) \
|
||||
$(NOUVEAU_CFLAGS)
|
||||
|
||||
dridir = $(DRI_DRIVER_INSTALL_DIR)
|
||||
|
||||
if HAVE_NOUVEAU_DRI
|
||||
dri_LTLIBRARIES = nouveau_vieux_dri.la
|
||||
endif
|
||||
|
||||
nouveau_vieux_dri_la_SOURCES = \
|
||||
$(NOUVEAU_C_FILES)
|
||||
|
||||
nouveau_vieux_dri_la_LDFLAGS = -module -avoid-version -shared
|
||||
nouveau_vieux_dri_la_LIBADD = \
|
||||
$(DRI_LIB_DEPS) \
|
||||
$(DRICORE_LIB_DEPS) \
|
||||
$(NOUVEAU_LIBS)
|
||||
|
||||
# Provide compatibility with scripts for the old Mesa build system for
|
||||
# a while by putting a link to the driver into /lib of the build tree.
|
||||
all-local: nouveau_vieux_dri.la
|
||||
$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
|
||||
ln -f .libs/nouveau_vieux_dri.so $(top_builddir)/$(LIB_DIR)/nouveau_vieux_dri.so;
|
||||
|
|
@ -1,13 +1,4 @@
|
|||
# src/mesa/drivers/dri/nouveau/Makefile
|
||||
|
||||
TOP = ../../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
LIBNAME = nouveau_vieux_dri.so
|
||||
|
||||
include ../Makefile.defines
|
||||
|
||||
DRIVER_SOURCES = \
|
||||
NOUVEAU_DRIVER_FILES = \
|
||||
nouveau_screen.c \
|
||||
nouveau_context.c \
|
||||
nouveau_fbo.c \
|
||||
|
|
@ -44,15 +35,5 @@ DRIVER_SOURCES = \
|
|||
nv20_state_frag.c \
|
||||
nv20_state_tnl.c
|
||||
|
||||
C_SOURCES = \
|
||||
$(COMMON_SOURCES) \
|
||||
$(DRIVER_SOURCES)
|
||||
|
||||
ASM_SOURCES =
|
||||
|
||||
INCLUDES += $(NOUVEAU_CFLAGS)
|
||||
DRI_LIB_DEPS += $(NOUVEAU_LIBS)
|
||||
|
||||
include ../Makefile.targets
|
||||
|
||||
symlinks:
|
||||
NOUVEAU_C_FILES = \
|
||||
$(NOUVEAU_DRIVER_FILES)
|
||||
Loading…
Reference in New Issue