aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-08-25 12:44:49 +0200
committerMihai Moldovan <ionic@ionic.de>2017-08-25 12:44:49 +0200
commitae0a2bfdeb9ceacb80aa03375353039d425b14b9 (patch)
treedaec55145477bcec69273e03d5c9ff10c10a4137 /nx-X11/programs/Xserver/hw/nxagent
parentcbe2c0e44f412d07024207f374c0f56684adb088 (diff)
parent3b7e5a42f5abecb903a9d730d163d704520efb07 (diff)
downloadnx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.gz
nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.bz2
nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.zip
Merge branch 'sunweaver-pr/libnx-x11-autoreconf' into 3.6.x
Attributes GH PR #498: https://github.com/ArcticaProject/nx-libs/pull/498
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile3
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile1
2 files changed, 4 insertions, 0 deletions
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` \