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/programs/Xserver/Imakefile | |
| 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/programs/Xserver/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index eb65fba19..9f730cb97 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -427,7 +427,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) #if defined(SunArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lXdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lNX_Xcomposite -lXdmcp \ `pkg-config --libs libxml-2.0` #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ @@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ #else NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes -lXfont \ - -L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \ + -L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \ `pkg-config --libs libxml-2.0` #endif |