aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-23 16:59:29 +0100
committermarha <marha@users.sourceforge.net>2012-01-23 16:59:29 +0100
commit780fcf7fcf5701c79568c95f32823cfa8e564665 (patch)
treee2f26cf384e44407829f2a66e30980280b9dffaf
parent49b6a2cc5d8cb1557b1991163385b9a8198ac99e (diff)
downloadvcxsrv-780fcf7fcf5701c79568c95f32823cfa8e564665.tar.gz
vcxsrv-780fcf7fcf5701c79568c95f32823cfa8e564665.tar.bz2
vcxsrv-780fcf7fcf5701c79568c95f32823cfa8e564665.zip
Also add xhost in package
-rw-r--r--xorg-server/installer/vcxsrv.nsi1
-rw-r--r--xorg-server/makefile6
2 files changed, 6 insertions, 1 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 168ffbe10..74a551dd0 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -77,6 +77,7 @@ Section "VcXsrv (required)"
File "..\protocol.txt"
File "..\system.XWinrc"
File "..\..\xkbcomp\obj\release\xkbcomp.exe"
+ File "..\..\apps\xhost\obj\release\xhost.exe"
File "..\..\apps\xcalc\obj\release\xcalc.exe"
File "..\xcalc"
File "..\xcalc-color"
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 9b3bdbc9c..6d8cbc8f3 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -117,6 +117,10 @@ load_makefile ..\apps\xwininfo\makefile MAKESERVER=0 DEBUG=0
xwininfo.exe: ..\apps\xwininfo\obj\release\xwininfo.exe
copy $< $@
+load_makefile ..\apps\xhost\makefile MAKESERVER=0 DEBUG=0
+xhost.exe: ..\apps\xhost\obj\release\xhost.exe
+ copy $< $@
+
load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=0
plink.exe: ..\tools\plink\obj\release\plink.exe
copy $< $@
@@ -125,7 +129,7 @@ load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0
load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0
load_makefile xkeyboard-config\makefile MAKESERVER=0 DEBUG=0
-all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XErrorDB \
+all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XErrorDB xhost.exe \
..\libX11\nls\all fonts.src\all xkeyboard-config\all plink.exe xclock.exe xcalc.exe \
xwininfo.exe swrast_dri_dbg.dll swrast_dri.dll dxtn.dll dxtn_dbg.dll \
swrastwgl_dri.dll swrastwgl_dri_dbg.dll