diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-16 07:18:11 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-16 07:18:24 +0100 |
| commit | e92c2a87808ec922b6bc90d5d5002ca77318f697 (patch) | |
| tree | fe4f6274ad211d11a269b689a0a855c28c706198 /nx-X11 | |
| parent | 0d6207bd3fa4eaf13a58a21dbaa20193403c1cbc (diff) | |
| download | nx-libs-e92c2a87808ec922b6bc90d5d5002ca77318f697.tar.gz nx-libs-e92c2a87808ec922b6bc90d5d5002ca77318f697.tar.bz2 nx-libs-e92c2a87808ec922b6bc90d5d5002ca77318f697.zip | |
Support building with legacy (pre-7.1.0) Xext proto versions.
Legacy Xext proto versions are automatically detected by the main
Makefile.
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 11 | ||||
| -rw-r--r-- | nx-X11/config/cf/host.def | 7 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvdisp.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 4 |
5 files changed, 29 insertions, 1 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 44fe2f3c1..5d989d1e0 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -546,6 +546,9 @@ X_BYTE_ORDER = ByteOrder #define HasShm NO #endif #endif +#ifndef HasLegacyXextProto +#define HasLegacyXextProto NO +#endif #ifndef HasCbrt #define HasCbrt YES #endif @@ -1882,6 +1885,12 @@ FONT_DEFINES = XFONTLIB = -lXfont #endif +#if HasLegacyXextProto +XEXT_EXTRA_DEFINES = -DLEGACY_XEXT_PROTO +#else +XEXT_EXTRA_DEFINES = +#endif + /* * Here we set up flags needed to produce position-independent code * when doing C and C++ compilation. The default if you specify C @@ -1980,7 +1989,7 @@ FONT_DEFINES = * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(FONT_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(SETITIMER_DEFINES) $(FONT_DEFINES) $(PROTO_DEFINES) $(XEXT_EXTRA_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib $(INSTALLED_LIBS) diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index abacf2c4e..0969a8f48 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -403,6 +403,13 @@ */ /* + * If building with SHM support enabled and using a legacy Xext protocol + * version (lower than 7.1.0), uncomment this. + * +#define HasLegacyXextProto YES + */ + +/* * If you are running NetBSD 0.9C or later, and have the aperture driver * installed, uncomment this. * diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 50a1f4590..b68d11c4c 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -432,6 +432,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define HasLegacyXfont1 NO #endif +#ifndef HasLegacyXextProto +# define HasLegacyXextProto NO +#endif + #ifndef BuildScreenSaverExt # define BuildScreenSaverExt YES #endif diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index b33bfa493..6f3e3729d 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -68,8 +68,12 @@ SOFTWARE. #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ +#ifdef LEGACY_XEXT_PROTO +#include <X11/extensions/XShm.h> +#else #include <X11/extensions/shmproto.h> #endif +#endif #include "xvdisp.h" diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index 6f6d67841..15466eea5 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -147,8 +147,12 @@ typedef void (*InitExtension)(void); #ifdef MITSHM #define _XSHM_SERVER_ +#ifdef LEGACY_XEXT_PROTO +#include <X11/extensions/XShm.h> +#else #include <X11/extensions/shmproto.h> #endif +#endif #ifdef XTEST #define _XTEST_SERVER_ #include <nx-X11/extensions/xtestconst.h> |