diff options
author | Mihai Moldovan <ionic@ionic.de> | 2015-05-25 23:23:22 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2015-05-25 23:23:22 +0200 |
commit | 230852e0e77985e1d62593fe393059dc0053c043 (patch) | |
tree | 81f6948179dffd3f28bb01569e1775abf1a7eaba /nx-X11/config/cf/X11.tmpl | |
parent | 608ee99284dc92e3751ba1ceb2fc5c5ac610f3ec (diff) | |
parent | a6185abd93143524eaddd617ad2cc20a4bd198f0 (diff) | |
download | nx-libs-230852e0e77985e1d62593fe393059dc0053c043.tar.gz nx-libs-230852e0e77985e1d62593fe393059dc0053c043.tar.bz2 nx-libs-230852e0e77985e1d62593fe393059dc0053c043.zip |
Merge branch 'sunweaver-pr/libxrandr-cleanup' into arctica-3.6.x
Attributes GH PR #21: https://github.com/ArcticaProject/nx-libs/pull/21
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
-rw-r--r-- | nx-X11/config/cf/X11.tmpl | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index de60cecaa..37f89696d 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -325,9 +325,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildRandR #define BuildRandR YES #endif -#ifndef BuildRandRLibrary -#define BuildRandRLibrary !BuildServersOnly -#endif #ifndef BuildXfixes #define BuildXfixes YES @@ -1529,30 +1526,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXrender NO #endif -#if BuildRandRLibrary -# ifndef SharedLibXrandr -# define SharedLibXrandr HasSharedLibraries -# endif -# ifndef NormalLibXrandr -# define NormalLibXrandr (!SharedLibXrandr || ForceNormalLib) -# endif -# ifndef DebugLibXrandr -# define DebugLibXrandr NO -# endif -# ifndef ProfileLibXrandr -# define ProfileLibXrandr NO -# endif -#else -# undef SharedLibXrandr -# define SharedLibXrandr NO -# undef NormalLibXrandr -# define NormalLibXrandr NO -# undef DebugLibXrandr -# define DebugLibXrandr NO -# undef ProfileLibXrandr -# define ProfileLibXrandr NO -#endif - #if BuildXfixesLibrary #ifndef SharedLibXfixes #define SharedLibXfixes HasSharedLibraries @@ -1753,16 +1726,6 @@ SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrend ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) #endif - XRANDRLIBSRC = $(LIBSRC)/Xrandr -#if SharedLibXrandr -#ifndef SharedXrandrRev -#define SharedXrandrRev 2.0 -#endif -SharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),SOXRANDRREV,SharedXrandrRev) -#else -ProjectUnsharedLibReferences(XRANDR,NX_Xrandr,$(XRANDRLIBSRC),XBuildLibDir) -#endif - XFIXESLIBSRC = $(LIBSRC)/Xfixes #if SharedLibXfixes #ifndef SharedXfixesRev |