diff options
| -rw-r--r-- | fb/Makefile.am | 8 | ||||
| -rw-r--r-- | fb/fb.h | 6 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/fbmodule.c | 6 |
4 files changed, 23 insertions, 3 deletions
diff --git a/fb/Makefile.am b/fb/Makefile.am index 11b2d2fea..251c1687b 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -1,4 +1,4 @@ -noinst_LTLIBRARIES = libfb.la libfbmmx.la +noinst_LTLIBRARIES = libfb.la libwfb.la libfbmmx.la INCLUDES = \ -I$(top_srcdir)/hw/xfree86/os-support \ @@ -11,7 +11,7 @@ sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h endif if MMX_CAPABLE -AM_CFLAGS += -DUSE_MMX +libfb_la_CFLAGS = $(AM_CFLAGS) -DUSE_MMX libfbmmx_la_CFLAGS = \ $(DIX_CFLAGS) \ @@ -23,6 +23,8 @@ libfbmmx_la_CFLAGS = \ --param large-function-growth=10000 endif +libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER + libfbmmx_la_SOURCES = \ fbmmx.c \ fbmmx.h @@ -70,6 +72,8 @@ libfb_la_SOURCES = \ fbedge.c \ fbedgeimp.h +libwfb_la_SOURCES = $(libfb_la_SOURCES) + libfb_la_LIBADD = libfbmmx.la EXTRA_DIST = fbcmap.c @@ -44,6 +44,12 @@ #include "picture.h" #endif +#ifdef FB_ACCESS_WRAPPER +#define FBPREFIX(x) wfb##x +#else +#define FBPREFIX(x) fb##x +#endif + /* * This single define controls the basic size of data manipulated * by this software; it must be log2(sizeof (FbBits) * 8) diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 65dad8a86..54bc09948 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -18,6 +18,7 @@ module_LTLIBRARIES = libafb.la \ libcfb.la \ libcfb32.la \ libfb.la \ + libwfb.la \ libmfb.la \ libshadow.la @@ -66,6 +67,11 @@ libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) +libwfb_la_LDFLAGS = -avoid-version +libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la +libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c +libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER + libglx_la_LDFLAGS = -avoid-version if AIGLX GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c index e8e6cd7c6..4df2646dd 100644 --- a/hw/xfree86/dixmods/fbmodule.c +++ b/hw/xfree86/dixmods/fbmodule.c @@ -33,7 +33,11 @@ static XF86ModuleVersionInfo VersRec = { +#ifdef FB_ACCESS_WRAPPER + "wfb", +#else "fb", +#endif MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -45,4 +49,4 @@ static XF86ModuleVersionInfo VersRec = {0,0,0,0} /* signature, to be patched into the file by a tool */ }; -_X_EXPORT XF86ModuleData fbModuleData = { &VersRec, NULL, NULL }; +_X_EXPORT XF86ModuleData FBPREFIX(ModuleData) = { &VersRec, NULL, NULL }; |