diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-04-26 22:35:00 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-04-26 22:35:00 +0200 |
| commit | 12104a232a6de163f7e871be288ac933083c4226 (patch) | |
| tree | 78ed57fea14b0fb86a5da16c89721b004e760bc3 /nx-X11/config/cf/X11.tmpl | |
| parent | 5729783dbbbaaea835cad2f6621c822c69fe02ea (diff) | |
| parent | ebcb6a6e172bded13a13963ea03d279541978e8e (diff) | |
| download | nx-libs-12104a232a6de163f7e871be288ac933083c4226.tar.gz nx-libs-12104a232a6de163f7e871be288ac933083c4226.tar.bz2 nx-libs-12104a232a6de163f7e871be288ac933083c4226.zip | |
Merge branch 'sunweaver-pr/libxrender-cleanup' into arctica-3.6.x
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 3e7423040..f02f80786 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -281,9 +281,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildRender #define BuildRender YES #endif -#ifndef BuildRenderLibrary -#define BuildRenderLibrary !BuildServersOnly -#endif #ifndef BuildRandR #define BuildRandR YES @@ -1317,31 +1314,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) DEPXLIBONLY = $(DEPXONLYLIB) XLIBONLY = $(XONLYLIB) LINTXONLYLIB = $(LINTXONLY) - -#if BuildRenderLibrary -#ifndef SharedLibXrender -#define SharedLibXrender HasSharedLibraries -#endif -#ifndef NormalLibXrender -#define NormalLibXrender (!SharedLibXrender || ForceNormalLib) -#endif -#ifndef DebugLibXrender -#define DebugLibXrender NO -#endif -#ifndef ProfileLibXrender -#define ProfileLibXrender NO -#endif -#else -#undef SharedLibXrender -#define SharedLibXrender NO -#undef NormalLibXrender -#define NormalLibXrender NO -#undef DebugLibXrender -#define DebugLibXrender NO -#undef ProfileLibXrender -#define ProfileLibXrender NO -#endif - #ifndef SharedLibXext #define SharedLibXext HasSharedLibraries #endif @@ -1367,17 +1339,6 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) XLIB = $(EXTENSIONLIB) $(XONLYLIB) LINTXLIB = $(LINTXONLYLIB) - - XRENDERLIBSRC = $(LIBSRC)/Xrender -#if SharedLibXrender -#ifndef SharedXrenderRev -#define SharedXrenderRev 1.2.2 -#endif -SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) -#else -ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir) -#endif - #ifndef SharedLibXau #define SharedLibXau YES #endif |