radeon: add cflags to decide whether to link libdrm_radeon or not.
You don't need libdrm_radeon for the legacy driver to build, only for the experimental mm/cs paths.
This commit is contained in:
parent
7d19d27684
commit
b0e8ac8fd2
|
@ -20,6 +20,8 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \
|
||||||
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
|
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
|
EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
|
||||||
|
RADEON_CFLAGS = @RADEON_CFLAGS@
|
||||||
|
RADEON_LDFLAGS = @RADEON_LDFLAGS@
|
||||||
|
|
||||||
# Assembler
|
# Assembler
|
||||||
MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
|
MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
|
||||||
|
|
|
@ -446,6 +446,8 @@ AC_SUBST([GALLIUM_WINSYS_DRM_DIRS])
|
||||||
AC_SUBST([GALLIUM_DRIVER_DIRS])
|
AC_SUBST([GALLIUM_DRIVER_DIRS])
|
||||||
AC_SUBST([GALLIUM_AUXILIARY_DIRS])
|
AC_SUBST([GALLIUM_AUXILIARY_DIRS])
|
||||||
AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
|
AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
|
||||||
|
AC_SUBST([RADEON_CFLAGS])
|
||||||
|
AC_SUBST([RADEON_LDFLAGS])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl User supplied program configuration
|
dnl User supplied program configuration
|
||||||
|
@ -573,6 +575,13 @@ dri)
|
||||||
GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
|
GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
|
||||||
DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
|
DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no)
|
||||||
|
|
||||||
|
if test "$HAVE_LIBDRM_RADEON" = yes; then
|
||||||
|
RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
|
||||||
|
RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
|
||||||
|
fi
|
||||||
|
|
||||||
# find the DRI deps for libGL
|
# find the DRI deps for libGL
|
||||||
if test "$x11_pkgconfig" = yes; then
|
if test "$x11_pkgconfig" = yes; then
|
||||||
# add xcb modules if necessary
|
# add xcb modules if necessary
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
TOP = ../../../../..
|
TOP = ../../../../..
|
||||||
include $(TOP)/configs/current
|
include $(TOP)/configs/current
|
||||||
|
|
||||||
|
CFLAGS += $(RADEON_CFLAGS)
|
||||||
|
|
||||||
LIBNAME = r200_dri.so
|
LIBNAME = r200_dri.so
|
||||||
|
|
||||||
MINIGLX_SOURCES = server/radeon_dri.c
|
MINIGLX_SOURCES = server/radeon_dri.c
|
||||||
|
@ -80,7 +82,7 @@ COMMON_SYMLINKS = \
|
||||||
radeon_dma.c \
|
radeon_dma.c \
|
||||||
radeon_dma.h
|
radeon_dma.h
|
||||||
|
|
||||||
DRI_LIB_DEPS += #-ldrm_radeon
|
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
|
||||||
|
|
||||||
##### TARGETS #####
|
##### TARGETS #####
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
TOP = ../../../../..
|
TOP = ../../../../..
|
||||||
include $(TOP)/configs/current
|
include $(TOP)/configs/current
|
||||||
|
|
||||||
|
CFLAGS += $(RADEON_CFLAGS)
|
||||||
|
|
||||||
LIBNAME = r300_dri.so
|
LIBNAME = r300_dri.so
|
||||||
|
|
||||||
MINIGLX_SOURCES = server/radeon_dri.c
|
MINIGLX_SOURCES = server/radeon_dri.c
|
||||||
|
@ -96,7 +98,7 @@ COMMON_SYMLINKS = \
|
||||||
radeon_texture.c \
|
radeon_texture.c \
|
||||||
radeon_texture.h
|
radeon_texture.h
|
||||||
|
|
||||||
DRI_LIB_DEPS += #-ldrm_radeon
|
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
|
||||||
|
|
||||||
##### TARGETS #####
|
##### TARGETS #####
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
TOP = ../../../../..
|
TOP = ../../../../..
|
||||||
include $(TOP)/configs/current
|
include $(TOP)/configs/current
|
||||||
|
|
||||||
|
CFLAGS += $(RADEON_CFLAGS)
|
||||||
|
|
||||||
LIBNAME = radeon_dri.so
|
LIBNAME = radeon_dri.so
|
||||||
|
|
||||||
MINIGLX_SOURCES = server/radeon_dri.c
|
MINIGLX_SOURCES = server/radeon_dri.c
|
||||||
|
@ -39,7 +41,7 @@ C_SOURCES = \
|
||||||
|
|
||||||
DRIVER_DEFINES = -DRADEON_COMMON=0
|
DRIVER_DEFINES = -DRADEON_COMMON=0
|
||||||
|
|
||||||
DRI_LIB_DEPS += #-ldrm_radeon
|
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
|
||||||
|
|
||||||
X86_SOURCES =
|
X86_SOURCES =
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue