From 51e4ed0fccc10248711562968f3c54e450a5eb5a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 10 Apr 2016 01:57:57 +0200 Subject: hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically be found in Xext/xvdisp.c. --- nx-X11/programs/Xserver/Xext/Imakefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/Xext/Imakefile') diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index 2c9798639..971d624e1 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -48,7 +48,10 @@ XF86BIGFOBJS = xf86bigfont.o #endif #endif -#if BuildXvExt +#if BuildXvExt && ( (defined(NXAgentServer) && NXAgentServer) && !defined(SunArchitecture) && !defined(cygwinArchitecture) ) + XVSRCS = xvmain.c xvmc.c + XVOBJS = xvmain.o xvmc.o +#elif BuildXvExt XVSRCS = xvmain.c xvdisp.c xvmc.c XVOBJS = xvmain.o xvdisp.o xvmc.o #endif -- cgit v1.2.3 From c6f86b3b2f0862edb95a46c6955876efe10e20f9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 11 Apr 2016 14:53:15 +0200 Subject: hw/nxagent/NXshm.c: Shrink file, drop duplicate code that can identically be found in Xext/shm.c. --- nx-X11/programs/Xserver/Xext/Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/Xext/Imakefile') diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index 971d624e1..f4add461e 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -30,7 +30,7 @@ XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.43 2003/04/21 18:56:48 sv SUBDIRS = extmod #endif -#if HasShm +#if HasShm && (!(defined(NXAgentServer) && NXAgentServer)) SHMSRCS = shm.c SHMOBJS = shm.o #endif -- cgit v1.2.3