aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-24 09:23:59 +0100
committermarha <marha@users.sourceforge.net>2012-01-24 09:23:59 +0100
commite665d084d9fe8a98cc663e2eb627f13ccb263046 (patch)
treeec7fcfed0687f70dd9815e0e604f8d4f3dff6547
parent3cb5a55a71915744b31678eb50969b4266b0798e (diff)
downloadvcxsrv-e665d084d9fe8a98cc663e2eb627f13ccb263046.tar.gz
vcxsrv-e665d084d9fe8a98cc663e2eb627f13ccb263046.tar.bz2
vcxsrv-e665d084d9fe8a98cc663e2eb627f13ccb263046.zip
Added xauth to 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 74a551dd0..a3c7244dd 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -78,6 +78,7 @@ Section "VcXsrv (required)"
File "..\system.XWinrc"
File "..\..\xkbcomp\obj\release\xkbcomp.exe"
File "..\..\apps\xhost\obj\release\xhost.exe"
+ File "..\..\apps\xauth\obj\release\xauth.exe"
File "..\..\apps\xcalc\obj\release\xcalc.exe"
File "..\xcalc"
File "..\xcalc-color"
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 6d8cbc8f3..4a3a7f201 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -121,6 +121,10 @@ load_makefile ..\apps\xhost\makefile MAKESERVER=0 DEBUG=0
xhost.exe: ..\apps\xhost\obj\release\xhost.exe
copy $< $@
+load_makefile ..\apps\xauth\makefile MAKESERVER=0 DEBUG=0
+xauth.exe: ..\apps\xauth\obj\release\xauth.exe
+ copy $< $@
+
load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=0
plink.exe: ..\tools\plink\obj\release\plink.exe
copy $< $@
@@ -129,7 +133,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 xhost.exe \
+all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XErrorDB xhost.exe xauth.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