diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-19 08:37:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-19 08:37:56 +0200 |
| commit | 1e8490bdbb42bb358a2d58526c0e21bc665989e4 (patch) | |
| tree | ba9c607f3535d0ed5b70462f398d4bee89f00ddc /xorg-server/installer/vcxsrv-64.nsi | |
| parent | 1531508ab9f3e354128ce17889784b703e99a480 (diff) | |
| download | vcxsrv-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-64.nsi')
| -rw-r--r-- | xorg-server/installer/vcxsrv-64.nsi | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index a7fa14a82..9c04e3ef8 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -21,7 +21,7 @@ Name "VcXsrv"
; The file to write
-OutFile "vcxsrv-64.1.14.2.1.installer.exe"
+OutFile "vcxsrv-64.1.14.3.installer.exe"
; The default installation directory
InstallDir $programfiles64\VcXsrv
@@ -65,6 +65,10 @@ Section "VcXsrv (required)" ; Remove old opengl32.dll file if it extits
IfFileExists "$INSTDIR\opengl32.dll" 0 +2
Delete "$INSTDIR\opengl32.dll"
+ IfFileExists "$INSTDIR\msvcr100.dll" 0 +2
+ Delete "$INSTDIR\msvcr100.dll"
+ IfFileExists "$INSTDIR\msvcp100.dll" 0 +2
+ Delete "$INSTDIR\msvcp100.dll"
; Put files there
File "..\obj64\servrelease\vcxsrv.exe"
@@ -101,8 +105,8 @@ Section "VcXsrv (required)" File "..\..\libX11\obj64\release\libX11.dll"
File "..\..\libXext\src\obj64\release\libXext.dll"
File "..\..\libXmu\src\obj64\release\libXmu.dll"
- File "msvcr100.dll"
- File "msvcp100.dll"
+ File "msvcr110.dll"
+ File "msvcp110.dll"
SetOutPath $INSTDIR\xkbdata
File /r "..\xkbdata\*.*"
SetOutPath $INSTDIR\locale
@@ -226,10 +230,10 @@ Section "Uninstall" Delete "$INSTDIR\libxml2.dll"
Delete "$INSTDIR\zlib1.dll"
Delete "$INSTDIR\iconv.dll"
- Delete "$INSTDIR\msvcr100.dll"
- Delete "$INSTDIR\msvcp100.dll"
- Delete "$INSTDIR\msvcr100d.dll"
- Delete "$INSTDIR\msvcp100d.dll"
+ Delete "$INSTDIR\msvcr110.dll"
+ Delete "$INSTDIR\msvcp110.dll"
+ Delete "$INSTDIR\msvcr110d.dll"
+ Delete "$INSTDIR\msvcp110d.dll"
RMDir /r "$INSTDIR\fonts"
RMDir /r "$INSTDIR\xkbdata"
|