diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-03 16:21:33 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-03 16:21:33 +0100 |
| commit | 89ccf26d65a3f205e54d9f6240b672f970e7b9c1 (patch) | |
| tree | 4a18ef7a3e031fa48acc292c8f52a0eaf3d49418 /nx-X11/programs/Xserver/fb | |
| parent | a54f3e0a8945b7e10d4bbeab5f4b14a35fbd3332 (diff) | |
| parent | 1c7b45d57380f6d445c8867fd77a1ecab072ee45 (diff) | |
| download | nx-libs-89ccf26d65a3f205e54d9f6240b672f970e7b9c1.tar.gz nx-libs-89ccf26d65a3f205e54d9f6240b672f970e7b9c1.tar.bz2 nx-libs-89ccf26d65a3f205e54d9f6240b672f970e7b9c1.zip | |
Merge branch 'sunweaver-pr/really-enable-MITSHM-in-fboverlay-c' into 3.6.x
Attributes GH PR #318: https://github.com/ArcticaProject/nx-libs/pull/318
Diffstat (limited to 'nx-X11/programs/Xserver/fb')
| -rw-r--r-- | nx-X11/programs/Xserver/fb/Imakefile | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/fb/fboverlay.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile index e1dadfdf3..5daa10c6f 100644 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ b/nx-X11/programs/Xserver/fb/Imakefile @@ -6,6 +6,9 @@ NULL = FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT #endif +#if HasShm +SHM_DEFINES = ShmDefines +#endif #if BuildRender RENDERSRC = fbcompose.c @@ -116,6 +119,8 @@ MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif +SpecialCObjectRule(fboverlay,$(ICONFIGFILES),$(SHM_DEFINES)) + #ifdef LinkDirectory LinkSourceFile(fb24_32.c,LinkDirectory) LinkSourceFile(fballpriv.c,LinkDirectory) diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c index 71a7f30d2..e51f922f5 100644 --- a/nx-X11/programs/Xserver/fb/fboverlay.c +++ b/nx-X11/programs/Xserver/fb/fboverlay.c @@ -32,6 +32,10 @@ #include "fb.h" #include "fboverlay.h" +#ifdef MITSHM +#include "shmint.h" +#endif + int fbOverlayGeneration; int fbOverlayScreenPrivateIndex = -1; |