diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
| commit | 975511c875674f097bbd2be33fa947a48d8c77c6 (patch) | |
| tree | 207bba2c48054f551f19ed5aa89b9dd9616b8c60 /nx-X11/programs/Xserver/fb | |
| parent | 9df153668423af868d0df739188a772fbc3356c6 (diff) | |
| parent | a5befd4e20813910022ed771cb599f15bbf4664d (diff) | |
| download | nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.gz nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.bz2 nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.zip | |
Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x
Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
Diffstat (limited to 'nx-X11/programs/Xserver/fb')
| -rw-r--r-- | nx-X11/programs/Xserver/fb/Imakefile | 12 |
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 \ |