diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:53:16 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:53:16 +0200 |
| commit | 279d37127db241a9ee685f6b671f51aa21a972ea (patch) | |
| tree | e41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/GL | |
| parent | dd5f5b56b48127641ca2bf70a272f60872f2568b (diff) | |
| parent | 487870fff5cd1bc3db5ade4f5721f483f96119c7 (diff) | |
| download | nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.gz nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.bz2 nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.zip | |
Merge branch 'sunweaver-pr/protocols-version-h' into 3.6.x
Attributes GH PR #160: https://github.com/ArcticaProject/nx-libs/pull/160
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:42:42 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/GL')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/Imakefile | 10 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxserver.h | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile index 05dfed738..24a35d22e 100644 --- a/nx-X11/programs/Xserver/GL/glx/Imakefile +++ b/nx-X11/programs/Xserver/GL/glx/Imakefile @@ -31,6 +31,8 @@ NXAGENT_SKIP_SRCS = \ NXAGENT_SKIP_OBJS = \ glxext.o \ $(NULL) +#else + NX_DEFINES = -DNXAGENT_SERVER #endif SRCS = global.c \ @@ -124,8 +126,12 @@ NXAGENT_SKIP_OBJS = \ XCOMM If you add "-DDEBUG" in DEFINES, then make sure you also XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c - DEFINES = $(GLX_DEFINES) $(NO_EXT_DEFS) $(APIENTRY_DEFS) - + DEFINES = \ + $(GLX_DEFINES) \ + $(NO_EXT_DEFS) \ + $(APIENTRY_DEFS) \ + $(NX_DEFINES) \ + $(NULL) #ifdef IHaveModules ModuleObjectRule() diff --git a/nx-X11/programs/Xserver/GL/glx/glxserver.h b/nx-X11/programs/Xserver/GL/glx/glxserver.h index 4238de537..a04d361fd 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxserver.h +++ b/nx-X11/programs/Xserver/GL/glx/glxserver.h @@ -52,7 +52,7 @@ #include <resource.h> #include <scrnintstr.h> #include "GL/glx_ansic.h" - +#include "protocol-versions.h" #include <limits.h> /* @@ -75,8 +75,8 @@ typedef struct __GLXdrawablePrivateRec __GLXdrawablePrivate; #include "glxerror.h" -#define GLX_SERVER_MAJOR_VERSION 1 -#define GLX_SERVER_MINOR_VERSION 2 +#define GLX_SERVER_MAJOR_VERSION SERVER_GLX_MAJOR_VERSION +#define GLX_SERVER_MINOR_VERSION SERVER_GLX_MINOR_VERSION #ifndef True #define True 1 |