diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2006-07-06 17:05:21 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-07-26 15:48:50 -0700 |
| commit | 7608a63ff7409f399c9a26962a304b84196a1868 (patch) | |
| tree | d5656254b294955875419be0d9b76d4feab089ae /fb | |
| parent | 39158e98acb29e97a2682d4a37385f9141b484c4 (diff) | |
Build infrastructure for libwfb.so.
Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la. Define a macro,
FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la. Use the
macro on [w]fbModuleData so the new module loads.
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/Makefile.am | 8 | ||||
| -rw-r--r-- | fb/fb.h | 6 |
2 files changed, 12 insertions, 2 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) |