diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-29 11:13:34 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-29 11:13:34 +0200 |
| commit | b9fb7a05ae01329ef6579b8a1d83926fe5374a76 (patch) | |
| tree | f321f6d6eba5693c915cb32e63a323b0d69ee746 /nx-X11/programs | |
| parent | b83a1484399bf0d3790b03206a97ec0d55296fb9 (diff) | |
| parent | f051b7a2d3c150c819d44c7ee648108755f71c85 (diff) | |
| download | nx-libs-b9fb7a05ae01329ef6579b8a1d83926fe5374a76.tar.gz nx-libs-b9fb7a05ae01329ef6579b8a1d83926fe5374a76.tar.bz2 nx-libs-b9fb7a05ae01329ef6579b8a1d83926fe5374a76.zip | |
Merge branch 'sunweaver-pr/libnx-xext-drop-unused-extensions' into 3.6.x
Attributes GH PR #121: https://github.com/ArcticaProject/nx-libs/pull/121
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Wed, 29 Jun 2016 00:45:43 -0700
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 3e320f8e1..0d820fad2 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -421,19 +421,32 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) */ #if defined(SunArchitecture) -NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lXcomposite -lXdmcp +NXAGENTNXLIBS = -L/usr/sfw/lib \ + -L ../../../nxcomp \ + -L../../../nx-X11/exports/lib \ + -L ../../../nxcompext -L ../../../nxcompshad \ + -lrt \ + -lXcomp \ + -lXcompext -lXcompshad \ + -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \ + -lNX_X11 -lNX_Xext #elif defined(cygwinArchitecture) -NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lXrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \ - -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXdmcp +NXAGENTNXLIBS = -L ../../../nxcomp \ + -L../../../nx-X11/exports/lib \ + -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp \ + -lXcompext -lXcompshad \ + -lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \ + -lNX_X11 -lNX_Xext #else -NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lXrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \ - -L../../../nx-X11/exports/lib -lXcomposite -lXinerama -lXdmcp +NXAGENTNXLIBS = -L ../../../nxcomp \ + -L../../../nx-X11/exports/lib \ + -L ../../../nxcompext -L ../../../nxcompshad \ + -lXcomp \ + -lXcompext -lXcompshad \ + -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \ + -lNX_X11 -lNX_Xext #endif - #endif #ifdef cygwinArchitecture |