aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/installer/vcxsrv-debug.nsi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-24 14:25:51 +0200
committermarha <marha@users.sourceforge.net>2013-07-25 08:25:18 +0200
commitde54c5b749b3eefb75d420840c889533a58aa342 (patch)
tree6502771c9dd5a0d455388734060469b18f2e4011 /xorg-server/installer/vcxsrv-debug.nsi
parent0606cba5be2dab08f0b4de540d7b278fa6273daf (diff)
downloadvcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.gz
vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.tar.bz2
vcxsrv-de54c5b749b3eefb75d420840c889533a58aa342.zip
64-bit compilation now compiles and runs
Diffstat (limited to 'xorg-server/installer/vcxsrv-debug.nsi')
-rw-r--r--xorg-server/installer/vcxsrv-debug.nsi7
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index 875a7dd3d..654e0239f 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -24,11 +24,11 @@ Name "VcXsrv"
OutFile "vcxsrv-debug.1.14.2.0.installer.exe"
; The default installation directory
-InstallDir $PROGRAMFILES\VcXsrv
+InstallDir $PROGRAMFILES32\VcXsrv
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\VcXsrv" "Install_Dir"
+InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir"
; Request application privileges for Windows Vista
RequestExecutionLevel admin
@@ -72,7 +72,7 @@ Section "VcXsrv debug exe and dlls"
File "..\..\apps\xwininfo\obj\debug\xwininfo.exe"
File "..\hw\xwin\xlaunch\obj\debug\xlaunch.exe"
File "..\..\tools\plink\obj\debug\plink.exe"
- File "..\..\mesalib\windows\VC8\mesa\Debug\swrast_dri.dll"
+ File "..\..\mesalib\windows\VC8\mesa\Win32\Debug\swrast_dri.dll"
File "..\hw\xwin\swrastwgl_dri\obj\debug\swrastwgl_dri.dll"
File "..\..\dxtn\obj\debug\dxtn.dll"
File "..\..\zlib\obj\debug\zlib1.dll"
@@ -84,4 +84,5 @@ Section "VcXsrv debug exe and dlls"
File "msvcr100d.dll"
File "msvcp100d.dll"
+ WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR"
SectionEnd