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/programs/Xserver/Imakefile | |
| 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/programs/Xserver/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index d034c2672..c7e1af550 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -402,17 +402,17 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lXfixes -lXfont \ + -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes -lXfont \ -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lXdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ - -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \ + -lXcomp -lXcompext -lXrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \ `pkg-config --libs libxml-2.0` #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ - -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \ + -lXcomp -lXcompext -lXcompshad -lXrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \ -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lXinerama -lXdmcp \ `pkg-config --libs libxml-2.0` #endif |