diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-20 14:30:45 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-04-20 15:20:12 -0700 |
| commit | 7a07a765c2a3816e8cd0487e8f66bc767024142d (patch) | |
| tree | 2981090528cac9ab5172749708a621fce4dd1b0a /src | |
| parent | 2971fd0a18e947c5d39d6af78b0b77d6e4fe00d8 (diff) | |
Steal RandR1.2 compat code from the Intel driver.
Spruce it up a bit so that --with-xserver-source works even if there's a local
compat copy.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 23 | ||||
| -rw-r--r-- | src/local_xf86Rename.h | 23 |
2 files changed, 45 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b31ebea..52b6b47 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ nv_drv_la_LTLIBRARIES = nv_drv.la nv_drv_la_LDFLAGS = -module -avoid-version nv_drv_ladir = @moduledir@/drivers @@ -81,3 +81,24 @@ g80_sources = \ g80_type.h \ g80_xaa.c \ g80_xaa.h + +xmode_sources = \ + @parser_dir@/xf86Parser.h \ + @parser_dir@/xf86Optrec.h \ + @modes_dir@/xf86Modes.h \ + @modes_dir@/xf86Modes.c \ + @modes_dir@/xf86cvt.c \ + @modes_dir@/xf86Crtc.h \ + @modes_dir@/xf86Crtc.c \ + @modes_dir@/xf86Cursors.c \ + @modes_dir@/xf86EdidModes.c \ + @modes_dir@/xf86RandR12.c \ + @modes_dir@/xf86RandR12.h \ + @modes_dir@/xf86Rename.h \ + @modes_dir@/xf86Rotate.c \ + @modes_dir@/xf86DiDGA.c + +if BUILD_XMODES +EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h +nodist_nv_drv_la_SOURCES = $(xmode_sources) +endif diff --git a/src/local_xf86Rename.h b/src/local_xf86Rename.h new file mode 100644 index 0000000..f3a07c6 --- /dev/null +++ b/src/local_xf86Rename.h @@ -0,0 +1,23 @@ +/* + *Copyright © 2006 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#define XF86NAME(x) nv_##x |