diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-18 16:22:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-18 16:22:37 +0000 |
| commit | bd6df75c18714c1d819adb07cc425cf74355a2a2 (patch) | |
| tree | 8d380b6c712d6123e1765f3f250af0b583b120bb /xorg-server/installer | |
| parent | 9d9a6fe500f361ad16c24441810bd9d00cf1727f (diff) | |
| parent | fe39224c389ccc187c2232d9cc796599e150fa6b (diff) | |
| download | vcxsrv-bd6df75c18714c1d819adb07cc425cf74355a2a2.tar.gz vcxsrv-bd6df75c18714c1d819adb07cc425cf74355a2a2.tar.bz2 vcxsrv-bd6df75c18714c1d819adb07cc425cf74355a2a2.zip | |
svn merge "^/branches/released" .
added XtErrorDB file
Diffstat (limited to 'xorg-server/installer')
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 25aa554d2..9ee2eabad 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -84,6 +84,7 @@ Section "VcXsrv (required)" File "..\..\apps\xwininfo\obj\release\xwininfo.exe"
File "..\XKeysymDB"
File "..\XErrorDB"
+ File "..\XtErrorDB"
File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
File "..\..\tools\plink\obj\release\plink.exe"
File "..\swrast_dri.dll"
@@ -100,6 +101,8 @@ Section "VcXsrv (required)" File /r "..\xkbdata\*.*"
SetOutPath $INSTDIR\locale
File /r "..\locale\*.*"
+ SetOutPath $INSTDIR\bitmaps
+ File /r "..\bitmaps\*.*"
; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR"
|