hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-18 00:42:40 +00:00
Code Issues Projects Releases Wiki Activity

Initial commit of XGL build infrastructure and XGL code changes for

Browse source 
building within the xorg server tree. Requires additional, uncommitted
    dix changes to successfully build, and successful running is still yet
    to happen.
This commit is contained in:
Eric Anholt 2005-12-28 10:31:46 +00:00
commit b1b40ed6a8
18 changed files with 187 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

37
hw/xgl/glx/Makefile.am
View file

@ -1,16 +1,15 @@
if XGLSERVER
MODULE_SUBDIRS = module
if XGL
XGL_MODULE_DIRS = module
endif
SUBDIRS = \
. \
$(MODULE_SUBDIRS)
$(XGL_MODULE_DIRS)
INCLUDES = \
@XGLX_INCS@ \
@XSERVER_CFLAGS@ \
@XGLSERVER_CFLAGS@ \
@XGLXSERVER_CFLAGS@
AM_CFLAGS = \
-I$(srcdir)/.. \
@SERVER_DEFINES@ \
$(XGLXMODULES_CFLAGS)
noinst_LTLIBRARIES = libxglx.la
@ -18,16 +17,22 @@ libxglx_la_SOURCES = \
xglx.h \
xglx.c
if XGLXSERVER
Xglx_DEPENDENCIES = @XGLX_LIBS@
Xglx_LDFLAGS = -export-dynamic
Xglx_SOURCES = xglxinit.c
Xglx_LDADD = \
@XGLX_LIBS@ \
@XSERVER_LIBS@ \
@XGLSERVER_LIBS@ \
@XGLXSERVER_LIBS@
Xglx_SOURCES = \
xglxinit.c \
$(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/Xext/dpmsstubs.c \
$(top_srcdir)/Xi/stubs.c \
$(top_srcdir)/fb/fbcmap.c
Xglx_LDADD = \
libxglx.la \
../libxgl.a \
$(XORG_CORE_LIBS) \
$(XGLX_LIBS) \
$(XSERVER_LIBS) \
$(EXTENSION_LIBS) \
$(XGLXMODULES_LIBS)
Xglx_programs = Xglx
endif
bin_PROGRAMS = $(Xglx_programs)

16
hw/xgl/glx/module/Makefile.am
View file

@ -1,14 +1,14 @@
INCLUDES = \
@XGLX_INCS@ \
@XSERVER_CFLAGS@ \
@XGLXSERVER_CFLAGS@
AM_CFLAGS = \
-I$(srcdir)/.. \
-I$(srcdir)/../.. \
$(XGLXMODULES_CFLAGS)
libxglx_la_LDFLAGS = -avoid-version
libxglx_la_SOURCES = xglxmodule.c
libxglx_la_LIBADD = \
@XGLX_MOD_LIBS@ \
@XGLXSERVER_LIBS@
libxglx_la_LIBADD = \
$(top_builddir)/hw/xgl/glx/libxglx.la \
$(XGLXMODULES_LIBS)
moduledir = @MODULEPATH@/xgl
moduledir = @xglmoduledir@
module_LTLIBRARIES = libxglx.la

14
hw/xgl/glx/xglxinit.c
View file

@ -25,7 +25,7 @@
#include "xglx.h"
static xglScreenInfoRec xglxScreenInfo = {
xglScreenInfoRec xglScreenInfo = {
NULL, 0, 0, 0, 0,
DEFAULT_GEOMETRY_DATA_TYPE,
DEFAULT_GEOMETRY_USAGE,
@ -53,7 +53,7 @@ InitOutput (ScreenInfo *pScreenInfo,
}
#endif
xglxInitOutput (&xglxScreenInfo, pScreenInfo, argc, argv);
xglxInitOutput (pScreenInfo, argc, argv);
}
Bool
@ -73,7 +73,7 @@ void
InitInput (int argc,
char **argv)
{
xglxInitInput (&xglxScreenInfo, argc, argv);
xglxInitInput (argc, argv);
}
void
@ -105,11 +105,11 @@ ddxProcessArgument (int argc,
}
#endif
skip = xglProcessArgument (&xglxScreenInfo, argc, argv, i);
skip = xglProcessArgument (argc, argv, i);
if (skip)
return skip;
return xglxProcessArgument (&xglxScreenInfo, argc, argv, i);
return xglxProcessArgument (argc, argv, i);
}
void
@ -129,3 +129,7 @@ OsVendorInit (void)
{
xglxOsVendorInit ();
}
void ddxInitGlobals(void)
{
}