aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/Imakefile11
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile3
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile1
3 files changed, 11 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 3c7e68597..86c5abf81 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -315,8 +315,9 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L/usr/sfw/lib \
- -L../../../nxcomp/src/.libs \
+ -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
+ -L../../lib/src/.libs \
-lrt \
-lXcomp \
-lXcompshad \
@@ -332,6 +333,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
+ -L../../lib/src/.libs \
-lXcomp \
-lXcompshad \
-lXrender \
@@ -343,9 +345,9 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-lXext \
$(NULL)
#elif defined(OpenBSDArchitecture)
-NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
- -L../../../nx-X11/exports/lib \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
+ -L../../lib/src/.libs \
-lkvm \
-lXcomp \
-lXcompshad \
@@ -359,8 +361,9 @@ NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-lXext \
$(NULL)
#else
-NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
+ -L../../lib/src/.libs \
-lXcomp \
-lXcompshad \
-lXrender \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index a1b059cae..43dace09e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -149,6 +149,7 @@ INCLUDES = \
-I../../GL/include \
-I../../../../lib/GL/include \
-I../../Xext \
+ -I../../../../lib/include/X11 \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
@@ -169,6 +170,7 @@ INCLUDES = \
-I../../Xext \
-I../../miext/damage \
-I../../miext/cw \
+ -I../../../../lib/include/X11 \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
@@ -192,6 +194,7 @@ INCLUDES = \
-I../../../../../nxcomp \
-I../../../../../nxcompshad \
-I../../../../extras/Mesa/include \
+ -I../../../../lib/include/X11 \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
index 8f0f17d1e..d364370ac 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
@@ -32,6 +32,7 @@ OBJS = \
INCLUDES = -I$(SERVERSRC)/include \
-I$(XBUILDINCDIR) \
+ -I../../../../../lib/include/X11 \
`pkg-config --cflags-only-I pixman-1` \
`pkg-config --cflags-only-I zlib` \
`pkg-config --cflags-only-I libpng` \