aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/installer/vcxsrv-debug.nsi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-19 08:37:56 +0200
committermarha <marha@users.sourceforge.net>2013-09-19 08:37:56 +0200
commit1e8490bdbb42bb358a2d58526c0e21bc665989e4 (patch)
treeba9c607f3535d0ed5b70462f398d4bee89f00ddc /xorg-server/installer/vcxsrv-debug.nsi
parent1531508ab9f3e354128ce17889784b703e99a480 (diff)
downloadvcxsrv-1e8490bdbb42bb358a2d58526c0e21bc665989e4.tar.gz
vcxsrv-1e8490bdbb42bb358a2d58526c0e21bc665989e4.tar.bz2
vcxsrv-1e8490bdbb42bb358a2d58526c0e21bc665989e4.zip
Increased version to 1.14.3 and now compile with Visual Studio 2012 Express Edition
Diffstat (limited to 'xorg-server/installer/vcxsrv-debug.nsi')
-rw-r--r--xorg-server/installer/vcxsrv-debug.nsi11
1 files changed, 8 insertions, 3 deletions
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index edde82641..8a3ea204a 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -21,7 +21,7 @@
Name "VcXsrv"
; The file to write
-OutFile "vcxsrv-debug.1.14.2.1.installer.exe"
+OutFile "vcxsrv-debug.1.14.3.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES32\VcXsrv
@@ -61,6 +61,11 @@ Section "VcXsrv debug exe and dlls"
; Set output path to the installation directory.
SetOutPath $INSTDIR
+ IfFileExists "$INSTDIR\msvcr100d.dll" 0 +2
+ Delete "$INSTDIR\msvcr100d.dll"
+ IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2
+ Delete "$INSTDIR\msvcp100d.dll"
+
; Put files there
File "..\obj\servdebug\vcxsrv.exe"
File "..\..\xkbcomp\obj\debug\xkbcomp.exe"
@@ -81,8 +86,8 @@ Section "VcXsrv debug exe and dlls"
File "..\..\libX11\obj\debug\libX11.dll"
File "..\..\libXext\src\obj\debug\libXext.dll"
File "..\..\libXmu\src\obj\debug\libXmu.dll"
- File "msvcr100d.dll"
- File "msvcp100d.dll"
+ File "msvcr110d.dll"
+ File "msvcp110d.dll"
WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR"
SectionEnd