diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:00:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:00:04 +0200 |
| commit | da7261cfe0244fcf329e0597f9d122293fd4f9eb (patch) | |
| tree | fe39b99fe89ac4fa65fec9c974379b5c52ada016 /nxcompshad | |
| parent | 2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1 (diff) | |
| parent | 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf (diff) | |
| download | nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.gz nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.bz2 nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.zip | |
Merge branch 'uli42-pr/drop_libNX_Xext' into 3.6.x
Attributes GH PR #175: https://github.com/ArcticaProject/nx-libs/pull/175
Diffstat (limited to 'nxcompshad')
| -rw-r--r-- | nxcompshad/Makefile.in | 2 | ||||
| -rw-r--r-- | nxcompshad/X11.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 9c2b6f4fd..053b00988 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -153,7 +153,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) else -EXTRALIBS = -lNX_Xext -lXtst -lXrandr -lXdamage +EXTRALIBS = -lXext -lXtst -lXrandr -lXdamage all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) diff --git a/nxcompshad/X11.h b/nxcompshad/X11.h index d7b858100..f5d7f2916 100644 --- a/nxcompshad/X11.h +++ b/nxcompshad/X11.h @@ -19,7 +19,7 @@ #define X11Poller_H #include <nx-X11/Xlib.h> -#include <nx-X11/extensions/XShm.h> +#include <X11/extensions/XShm.h> #include "X11/include/Xdamage_nxcompshad.h" #include "X11/include/Xrandr_nxcompshad.h" |