diff options
| author | marha <marha@users.sourceforge.net> | 2013-04-15 09:50:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-04-15 09:50:01 +0200 |
| commit | e50b38aebb733934db7ef3ec13c330407afd9ada (patch) | |
| tree | 94dbe389fd268f38746ad7d374c57cccafa006e1 | |
| parent | 527aeeb096cce731d40f1d9750503ff2b0c38d7c (diff) | |
| download | vcxsrv-e50b38aebb733934db7ef3ec13c330407afd9ada.tar.gz vcxsrv-e50b38aebb733934db7ef3ec13c330407afd9ada.tar.bz2 vcxsrv-e50b38aebb733934db7ef3ec13c330407afd9ada.zip | |
xrdb now compiles and links
| -rw-r--r-- | apps/xrdb/xrdb.c | 1 | ||||
| -rw-r--r-- | libX11/libX11.def | 2 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv-debug.nsi | 1 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 1 | ||||
| -rw-r--r-- | xorg-server/makefile | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/apps/xrdb/xrdb.c b/apps/xrdb/xrdb.c index b7c9fa3aa..d086a603c 100644 --- a/apps/xrdb/xrdb.c +++ b/apps/xrdb/xrdb.c @@ -53,6 +53,7 @@ #include <errno.h> #include <stdlib.h> #include <stdarg.h> +#include <unistd.h> #ifdef NEED_SYS_PARAM_H # include <sys/param.h> /* defines MAXHOSTNAMELEN on BSD & Linux */ diff --git a/libX11/libX11.def b/libX11/libX11.def index 574733278..b2fd214ca 100644 --- a/libX11/libX11.def +++ b/libX11/libX11.def @@ -120,6 +120,7 @@ EXPORTS XFreeColormap
XFreeColors
XFreeCursor
+ XFreeExtensionList
XFreeFont
XFreeFontSet
XFreeGC
@@ -208,6 +209,7 @@ EXPORTS XKeysymToString
XKillClient
XListDepths
+ XListExtensions
XListHosts
XListPixmapFormats
XLoadFont
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index fb9f5539d..10adb6888 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -65,6 +65,7 @@ Section "VcXsrv debug exe and dlls" File "..\obj\servdebug\vcxsrv.exe"
File "..\..\xkbcomp\obj\debug\xkbcomp.exe"
File "..\..\apps\xhost\obj\debug\xhost.exe"
+ File "..\..\apps\xrdb\obj\debug\xrdb.exe"
File "..\..\apps\xauth\obj\debug\xauth.exe"
File "..\..\apps\xcalc\obj\debug\xcalc.exe"
File "..\..\apps\xclock\obj\debug\xclock.exe"
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index a6e492eae..103b13cd5 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -72,6 +72,7 @@ Section "VcXsrv (required)" File "..\system.XWinrc"
File "..\..\xkbcomp\obj\release\xkbcomp.exe"
File "..\..\apps\xhost\obj\release\xhost.exe"
+ File "..\..\apps\xrdb\obj\release\xrdb.exe"
File "..\..\apps\xauth\obj\release\xauth.exe"
File "..\..\apps\xcalc\obj\release\xcalc.exe"
File "..\..\apps\xcalc\app-defaults\xcalc"
diff --git a/xorg-server/makefile b/xorg-server/makefile index caaa12029..5e31c21d3 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -88,6 +88,7 @@ EXTRASTOBUILD = \ ..\apps\xclock\$(NOSERVOBJDIR)\xclock.exe \ ..\apps\xwininfo\$(NOSERVOBJDIR)\xwininfo.exe \ ..\apps\xhost\$(NOSERVOBJDIR)\xhost.exe \ + ..\apps\xrdb\$(NOSERVOBJDIR)\xrdb.exe \ ..\apps\xauth\$(NOSERVOBJDIR)\xauth.exe \ ..\tools\plink\$(NOSERVOBJDIR)\plink.exe \ hw\xwin\swrastwgl_dri\$(NOSERVOBJDIR)\swrastwgl_dri.dll \ |