diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 13:54:11 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 15:56:28 +0200 |
| commit | 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf (patch) | |
| tree | fe39b99fe89ac4fa65fec9c974379b5c52ada016 /nx-X11/programs | |
| parent | e78c5bc3c2df117b4c8e5e4bd24c985cd89c49ad (diff) | |
| download | nx-libs-1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf.tar.gz nx-libs-1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf.tar.bz2 nx-libs-1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf.zip | |
finally drop libNX_Xext
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index d0699d857..1c582614d 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -429,7 +429,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \ -lXcomp \ -lXcompext -lXcompshad \ -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \ - -lNX_X11 -lNX_Xext -Xext + -lNX_X11 -lXext #elif defined(cygwinArchitecture) NXAGENTNXLIBS = -L ../../../nxcomp \ -L../../../nx-X11/exports/lib \ @@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp \ -lXcomp \ -lXcompext -lXcompshad \ -lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \ - -lNX_X11 -lNX_Xext -lXext + -lNX_X11 -lXext #else NXAGENTNXLIBS = -L ../../../nxcomp \ -L../../../nx-X11/exports/lib \ @@ -445,7 +445,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp \ -lXcomp \ -lXcompext -lXcompshad \ -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \ - -lNX_X11 -lNX_Xext -lXext + -lNX_X11 -lXext #endif #endif @@ -478,7 +478,7 @@ nxagent_static_nolibs: nxagent else exit 0; fi $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) \ - $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 -lXext $(EXTRA_LOAD_FLAGS) + $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_LOAD_FLAGS) #endif /* NXAgentServer */ #if defined(NXWinServer) && NXWinServer diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 72da2df19..866ab581c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -44,7 +44,7 @@ #undef Pixmap #include "region.h" -#include "extutil.h" +#include <X11/extensions/extutil.h> #include "Display.h" #include "Pixmaps.h" |