diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-06-02 21:54:12 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-06-02 21:54:12 +0200 |
| commit | b5d78278debb1006eaf63d460f9bd6082fa3f860 (patch) | |
| tree | 478fe2034ac0330811f9d4a396295c12e6a87977 /nx-X11/config/cf | |
| parent | 167d09ed740529bc43c1b32a34e80be12c6eb257 (diff) | |
| parent | 6a74e671af51a2afdade8d1fc8ca0ca2ad5c536c (diff) | |
| download | nx-libs-b5d78278debb1006eaf63d460f9bd6082fa3f860.tar.gz nx-libs-b5d78278debb1006eaf63d460f9bd6082fa3f860.tar.bz2 nx-libs-b5d78278debb1006eaf63d460f9bd6082fa3f860.zip | |
Merge branch 'sunweaver-pr/libxres-cleanup' into arctica-3.6.x
Attributes GH PR #39: https://github.com/ArcticaProject/nx-libs/pull/39
Diffstat (limited to 'nx-X11/config/cf')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 37 | ||||
| -rw-r--r-- | nx-X11/config/cf/lnxLib.tmpl | 1 | ||||
| -rw-r--r-- | nx-X11/config/cf/xfree86.cf | 3 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 3 |
4 files changed, 0 insertions, 44 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 37f89696d..c1b278e67 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -281,9 +281,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildXResExt #define BuildXResExt NO #endif -#ifndef BuildXResLibrary -#define BuildXResLibrary (BuildXResExt && !BuildServersOnly) -#endif #ifndef BuildXvExt #define BuildXvExt NO #endif @@ -1478,30 +1475,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXinerama NO #endif -#if BuildXResLibrary -#ifndef SharedLibXRes -#define SharedLibXRes HasSharedLibraries -#endif -#ifndef NormalLibXRes -#define NormalLibXRes (!SharedLibXRes || ForceNormalLib) -#endif -#ifndef DebugLibXRes -#define DebugLibXRes NO -#endif -#ifndef ProfileLibXRes -#define ProfileLibXRes NO -#endif -#else -#undef SharedLibXRes -#define SharedLibXRes NO -#undef NormalLibXRes -#define NormalLibXRes NO -#undef DebugLibXRes -#define DebugLibXRes NO -#undef ProfileLibXRes -#define ProfileLibXRes NO -#endif - #if BuildRenderLibrary #ifndef SharedLibXrender #define SharedLibXrender HasSharedLibraries @@ -1696,16 +1669,6 @@ SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedX ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) #endif - XRESLIBSRC = $(LIBSRC)/XRes -#if SharedLibXRes -#ifndef SharedXResRev -#define SharedXResRev 1.0 -#endif -SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev) -#else -ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir) -#endif - GLXLIBSRC = $(LIBSRC)/GL #if SharedLibGlx #ifndef SharedGlxRev diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index 33c89e102..ee372709a 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -19,7 +19,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #endif #define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs -#define SharedXResReqs $(LDPRELIB) $(XLIB) #define SharedXineramaReqs $(LDPRELIB) $(XLIB) #define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) #define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index dea9b74b5..673902129 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -1541,9 +1541,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildGLXLibrary # define BuildGLXLibrary YES #endif -#ifndef BuildXResLibrary -# define BuildXResLibrary YES -#endif #endif /* diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index d4ef89fd4..1ef1260b4 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -1105,9 +1105,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildGLXLibrary # define BuildGLXLibrary YES #endif -#ifndef BuildXResLibrary -# define BuildXResLibrary YES -#endif #endif /* |