aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/X11.tmpl
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-06-16 23:58:50 +0200
committerMihai Moldovan <ionic@ionic.de>2015-06-16 23:58:50 +0200
commit51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b (patch)
tree567c82168ede70dfc7532e93be9bc61159fb9753 /nx-X11/config/cf/X11.tmpl
parent5a64974cc5f0e9001cb0ddba4cb2c956ba43f7df (diff)
parent5cd80d272ba366686a3b28c5915cb5bf3ada8985 (diff)
downloadnx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.tar.gz
nx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.tar.bz2
nx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.zip
Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x
Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
-rw-r--r--nx-X11/config/cf/X11.tmpl69
1 files changed, 0 insertions, 69 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index c1b278e67..8b3cf33a1 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -289,23 +289,10 @@ XORGRELSTRING = XorgManVersionString
#endif
#ifndef BuildGlxExt
#define BuildGlxExt NO
-#else
-#if BuildGlxExt && !defined(XFree86Version) && !defined(XorgVersion)
-#undef BuildXF86DRI
-#undef BuildXF86DRIDriverSupport
-#define BuildXF86DRI NO
-#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 +1534,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 +1610,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