aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/fb
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-04-13 15:28:33 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-25 00:39:27 +0200
commit778e83a3cb717f4033a3bff65134cc5697a528fc (patch)
tree46ddd3f686e7bd5ce4bcb779ba2be360d42c29c7 /nx-X11/programs/Xserver/fb
parentde03d62270f33f1e6104fea13a7742bb6a5dc609 (diff)
downloadnx-libs-778e83a3cb717f4033a3bff65134cc5697a528fc.tar.gz
nx-libs-778e83a3cb717f4033a3bff65134cc5697a528fc.tar.bz2
nx-libs-778e83a3cb717f4033a3bff65134cc5697a528fc.zip
hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files in nxagent's code base. Rather replace structures we need modified only.
Diffstat (limited to 'nx-X11/programs/Xserver/fb')
-rw-r--r--nx-X11/programs/Xserver/fb/Imakefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile
index 662a70717..2d17a856e 100644
--- a/nx-X11/programs/Xserver/fb/Imakefile
+++ b/nx-X11/programs/Xserver/fb/Imakefile
@@ -34,7 +34,7 @@ SUBDIRS = module
#include <Server.tmpl>
#ifdef FbNoPixelAddrCode
-DEFINES=-DFBNOPIXADDR -DFBNO24BIT
+FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT
#endif
#if defined(IHaveModules)
@@ -47,6 +47,16 @@ RENDERSRC = fbcompose.c
RENDEROBJ = fbcompose.o
#endif
+#if defined(NXAgentServer) && NXAgentServer
+NX_DEFINES = -DNXAGENT_SERVER
+#endif
+
+#if defined(NXAgentServer) && NXAgentServer
+ DEFINES = $(FB_DEFINES) $(NX_DEFINES)
+#else
+ DEFINES = $(FB_DEFINES)
+#endif
+
SRCS = $(XFMODSRC) \
fballpriv.c \
fbbits.c \