automake: src/mesa/drivers/dri/i915
This commit is contained in:
Matt Turner
+1
-1
@@ -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 = i915 nouveau r200 radeon swrast
|
||||
DRI_DIRS = nouveau r200 radeon swrast
|
||||
|
||||
INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
|
||||
INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
|
||||
|
||||
+12
-5
@@ -1257,15 +1257,21 @@ case $DRI_DIRS in
|
||||
*i915*|*i965*)
|
||||
PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
|
||||
|
||||
case $DRI_DIRS in
|
||||
*i965*)
|
||||
HAVE_I965_DRI=yes;
|
||||
;;
|
||||
esac
|
||||
for d in $(echo $DRI_DIRS | sed 's/,/ /g'); do
|
||||
case $d in
|
||||
i915)
|
||||
HAVE_I915_DRI=yes;
|
||||
;;
|
||||
i965)
|
||||
HAVE_I965_DRI=yes;
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
;;
|
||||
esac
|
||||
|
||||
AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
|
||||
AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
|
||||
|
||||
case $DRI_DIRS in
|
||||
@@ -1904,6 +1910,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
|
||||
|
||||
dnl Substitute the config
|
||||
AC_CONFIG_FILES([configs/autoconf
|
||||
src/mesa/drivers/dri/i915/Makefile
|
||||
src/mesa/drivers/dri/i965/Makefile
|
||||
tests/Makefile
|
||||
tests/glx/Makefile])
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
.deps
|
||||
.libs
|
||||
Makefile
|
||||
Makefile.in
|
||||
i915_dri.la
|
||||
@@ -42,7 +42,7 @@ LOCAL_C_INCLUDES := \
|
||||
$(DRM_TOP)/intel
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(i915_C_SOURCES)
|
||||
$(i915_C_FILES)
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
||||
$(MESA_DRI_WHOLE_STATIC_LIBRARIES)
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
|
||||
TOP = ../../../../..
|
||||
include $(TOP)/configs/current
|
||||
|
||||
LIBNAME = i915_dri.so
|
||||
|
||||
include ../Makefile.defines
|
||||
|
||||
# Import variables i915_*.
|
||||
include Makefile.sources
|
||||
|
||||
C_SOURCES = \
|
||||
$(COMMON_SOURCES) \
|
||||
$(i915_C_SOURCES)
|
||||
|
||||
ASM_SOURCES =
|
||||
|
||||
DRIVER_DEFINES = $(addprefix -I$(TOP)/, $(i915_INCLUDES)) -DI915 \
|
||||
$(shell $(PKG_CONFIG) libdrm --atleast-version=2.3.1 \
|
||||
&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
|
||||
|
||||
INCLUDES += $(INTEL_CFLAGS)
|
||||
DRI_LIB_DEPS += $(INTEL_LIBS)
|
||||
|
||||
include ../Makefile.targets
|
||||
|
||||
intel_decode.o: ../intel/intel_decode.c
|
||||
|
||||
intel_tex_layout.o: ../intel/intel_tex_layout.c
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
|
||||
|
||||
# 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 = \
|
||||
-DI915 \
|
||||
-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 \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/intel \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
|
||||
$(DEFINES) \
|
||||
$(ASM_FLAGS) \
|
||||
$(API_DEFINES) \
|
||||
$(INTEL_CFLAGS)
|
||||
|
||||
dridir = $(DRI_DRIVER_INSTALL_DIR)
|
||||
|
||||
if HAVE_I915_DRI
|
||||
dri_LTLIBRARIES = i915_dri.la
|
||||
endif
|
||||
|
||||
i915_dri_la_SOURCES = \
|
||||
$(i915_C_FILES) \
|
||||
$(i915_CXX_FILES)
|
||||
|
||||
i915_dri_la_LDFLAGS = -module -avoid-version -shared
|
||||
i915_dri_la_LIBADD = \
|
||||
$(DRI_LIB_DEPS) \
|
||||
$(DRICORE_LIB_DEPS) \
|
||||
$(INTEL_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: i915_dri.la
|
||||
$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
|
||||
ln -f .libs/i915_dri.so $(top_builddir)/$(LIB_DIR)/i915_dri.so;
|
||||
@@ -2,7 +2,7 @@
|
||||
i915_INCLUDES := \
|
||||
src/mesa/drivers/dri/intel
|
||||
|
||||
i915_C_SOURCES := \
|
||||
i915_C_FILES := \
|
||||
i830_context.c \
|
||||
i830_state.c \
|
||||
i830_texblend.c \
|
||||
|
||||
Reference in New Issue
Block a user