diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-05-26 16:22:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-06-16 23:00:58 +0200 |
| commit | cb4a2d732001d32fa1e95bb15e047da12b6c9754 (patch) | |
| tree | 3320c8160de7a8b23e1a1eab1febfc6e3daf384b /nx-X11/config/cf | |
| parent | 5a64974cc5f0e9001cb0ddba4cb2c956ba43f7df (diff) | |
| download | nx-libs-cb4a2d732001d32fa1e95bb15e047da12b6c9754.tar.gz nx-libs-cb4a2d732001d32fa1e95bb15e047da12b6c9754.tar.bz2 nx-libs-cb4a2d732001d32fa1e95bb15e047da12b6c9754.zip | |
Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree.
The client-side library libNX_GL.{a,so} is not built when building nx-libs.
However, nx-X11/lib/GL/** ships several imake include files
(Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**.
These files have been moved from the nx-X11/lib/GL/ code subtree to the
nx-X11/programs/Xserver/GL/.
Furthermore, we don't provide module builds of the GL extension anymore,
as that feature is neither used in nx-libs.
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 62 | ||||
| -rw-r--r-- | nx-X11/config/cf/xfree86.cf | 11 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 11 |
3 files changed, 0 insertions, 84 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index c1b278e67..91a9aa6a6 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -297,15 +297,9 @@ XORGRELSTRING = XorgManVersionString #define BuildXF86DRIDriverSupport NO #endif #endif -#ifndef BuildGLXLibrary -#define BuildGLXLibrary (BuildGlxExt && !BuildServersOnly) -#endif #ifndef BuildOSMesaLib #define BuildOSMesaLib BuildGlxExt #endif -#ifndef BuildXDriInfo -#define BuildXDriInfo (BuildGLXLibrary && !BuildServersOnly) -#endif #ifndef BuildXF86RushExt #define BuildXF86RushExt NO #endif @@ -1547,52 +1541,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXcomposite NO #endif -#if BuildGLXLibrary -#ifndef SharedLibGlx -#define SharedLibGlx HasSharedLibraries -#endif -#ifndef NormalLibGlx -#define NormalLibGlx (!SharedLibX11 | ForceNormalLib) -#endif -#ifndef DebugLibGlx -#define DebugLibGlx NO -#endif -#ifndef ProfileLibGlx -#define ProfileLibGlx NO -#endif -#ifndef BuildLibGlxWithoutPIC -#define BuildLibGlxWithoutPIC NO -#endif -#if BuildLibGlxWithoutPIC && SharedLibGlx -#define SharedLibGlxWithoutPIC YES -#else -#define SharedLibGlxWithoutPIC NO -#endif -#ifndef LinkGLToUsrLib -#define LinkGLToUsrLib NO -#endif -#if NothingOutsideProjectRoot -#undef LinkGLToUsrLib -#define LinkGLToUsrLib NO -#endif -#ifndef LinkGLToUsrInclude -#define LinkGLToUsrInclude NO -#endif -#if NothingOutsideProjectRoot -#undef LinkGLToUsrInclude -#define LinkGLToUsrInclude NO -#endif -#else -#undef SharedLibGlx -#define SharedLibGlx NO -#undef NormalLibGlx -#define NormalLibGlx NO -#undef DebugLibGlx -#define DebugLibGlx NO -#undef ProfileLibGlx -#define ProfileLibGlx NO -#endif - #ifndef SharedLibXext #define SharedLibXext HasSharedLibraries #endif @@ -1669,16 +1617,6 @@ SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedX ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) #endif - GLXLIBSRC = $(LIBSRC)/GL -#if SharedLibGlx -#ifndef SharedGlxRev -#define SharedGlxRev 1.2 -#endif -SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) -#else -ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) -#endif - XRENDERLIBSRC = $(LIBSRC)/Xrender #if SharedLibXrender #ifndef SharedXrenderRev diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 673902129..11c6a95c9 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -1282,14 +1282,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #if BuildXF86DRI -#ifndef BuildGLXLibrary -# if defined (BuildServersOnly) && BuildServersOnly -# define BuildGLXLibrary NO -# else -# define BuildGLXLibrary YES -# endif -#endif - /* * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. * If more than one are defined, the compilation will fail with multiply @@ -1538,9 +1530,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildXF86VidModeLibrary # define BuildXF86VidModeLibrary YES #endif -#ifndef BuildGLXLibrary -# define BuildGLXLibrary YES -#endif #endif /* diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 1ef1260b4..8210cb049 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -846,14 +846,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #define DevelDRIDrivers /**/ #endif -#ifndef BuildGLXLibrary -# if defined (BuildServersOnly) && BuildServersOnly -# define BuildGLXLibrary NO -# else -# define BuildGLXLibrary YES -# endif -#endif - /* * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. * If more than one are defined, the compilation will fail with multiply @@ -1102,9 +1094,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildXF86VidModeLibrary # define BuildXF86VidModeLibrary YES #endif -#ifndef BuildGLXLibrary -# define BuildGLXLibrary YES -#endif #endif /* |