c5a612fc18
Let configure --enable/disable-aiglx control building of AIGLX for all DDXs. Currently we can't use --enable/disable-aiglx to control if Xwin DDX is built with AIGLX enabled, as at the moment it's forced off if we aren't building the X.Org DDX DRI or DRI2 loader Rearrange things a bit, introducing a new automake conditional, AIGLX_DRI_LOADER to specifically indicate if the X.Org DDX DRI/DRI2 loader convenience library should be built, and replace the previous X.Org DDX-specific uses of the AIGLX conditional with that As before, AIGLX_DRI_LOADER is only enabled if --enable-glx, --enable-aiglx and at least one of --enable-dri or --enable-dri2 are enabled This allows the general conditional AIGLX to control if AIGLX is built for the XWin DDX as well The C #define AIGLX set by AC_DEFINE(AIGLX) seems to be obsolete, I can't find anything which checks it Updated for ajax's "glx: Make --disable-dri not disable AIGLX" patch, which allows DRI2 to be enabled independently of DRI1 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
102 lines
1.9 KiB
Makefile
102 lines
1.9 KiB
Makefile
if AIGLX_DRI_LOADER
|
|
GLXDRI_LIBRARY = libglxdri.la
|
|
endif
|
|
|
|
noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
|
|
|
|
AM_CFLAGS = \
|
|
@DIX_CFLAGS@ \
|
|
@GL_CFLAGS@ \
|
|
@DRI_CFLAGS@ \
|
|
@XLIB_CFLAGS@ \
|
|
@LIBDRM_CFLAGS@ \
|
|
@DRIPROTO_CFLAGS@ \
|
|
@GLX_DEFINES@ \
|
|
@GLX_ARCH_DEFINES@
|
|
|
|
# none yet
|
|
#sdk_HEADERS =
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir)/hw/xfree86/os-support \
|
|
-I$(top_srcdir)/hw/xfree86/os-support/bus \
|
|
-I$(top_srcdir)/hw/xfree86/common \
|
|
-I$(top_srcdir)/hw/xfree86/dri \
|
|
-I$(top_srcdir)/mi
|
|
|
|
if DRI2_AIGLX
|
|
INCLUDES += -I$(top_srcdir)/hw/xfree86/dri2
|
|
endif
|
|
|
|
glapi_sources = \
|
|
indirect_dispatch.c \
|
|
indirect_dispatch.h \
|
|
indirect_dispatch_swap.c \
|
|
indirect_reqsize.c \
|
|
indirect_reqsize.h \
|
|
indirect_size.h \
|
|
indirect_size_get.c \
|
|
indirect_size_get.h \
|
|
indirect_table.c \
|
|
dispatch.h \
|
|
glapitable.h \
|
|
glapi.c \
|
|
glapi.h \
|
|
glapioffsets.h \
|
|
glprocs.h \
|
|
glthread.c \
|
|
glthread.h
|
|
|
|
libglxdri_la_SOURCES = \
|
|
extension_string.c \
|
|
extension_string.h
|
|
|
|
if DRI
|
|
libglxdri_la_SOURCES += glxdri.c
|
|
endif
|
|
|
|
if DRI2_AIGLX
|
|
libglxdri_la_SOURCES += glxdri2.c
|
|
endif
|
|
|
|
libglxdri_la_LIBADD = $(DLOPEN_LIBS)
|
|
|
|
libglx_la_SOURCES = \
|
|
$(indirect_sources) \
|
|
$(glapi_sources) \
|
|
indirect_util.c \
|
|
indirect_util.h \
|
|
indirect_program.c \
|
|
indirect_table.h \
|
|
indirect_texture_compression.c \
|
|
glxbyteorder.h \
|
|
glxcmds.c \
|
|
glxcmdsswap.c \
|
|
glxcontext.h \
|
|
glxdrawable.h \
|
|
glxext.c \
|
|
glxext.h \
|
|
glxdriswrast.c \
|
|
glxdricommon.c \
|
|
glxdricommon.h \
|
|
glxscreens.c \
|
|
glxscreens.h \
|
|
glxserver.h \
|
|
glxutil.h \
|
|
render2.c \
|
|
render2swap.c \
|
|
renderpix.c \
|
|
renderpixswap.c \
|
|
rensize.c \
|
|
single2.c \
|
|
single2swap.c \
|
|
singlepix.c \
|
|
singlepixswap.c \
|
|
singlesize.c \
|
|
singlesize.h \
|
|
swap_interval.c \
|
|
unpack.h \
|
|
xfont.c
|
|
|
|
libglx_la_LIBADD = $(DLOPEN_LIBS)
|