diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 16:58:49 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 16:58:49 +0100 |
| commit | 6d8fefe38077f4d532c256e79cfcaf2a46c5269d (patch) | |
| tree | dfc74a8d253b690dac620212cbb9d46001cdaa2b /xorg-server/installer/vcxsrv-64.nsi | |
| parent | 0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (diff) | |
| download | vcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.tar.gz vcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.tar.bz2 vcxsrv-6d8fefe38077f4d532c256e79cfcaf2a46c5269d.zip | |
Now use visual studio 2013 express edition for compilation
Diffstat (limited to 'xorg-server/installer/vcxsrv-64.nsi')
| -rw-r--r-- | xorg-server/installer/vcxsrv-64.nsi | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index 9c04e3ef8..d452c0634 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -69,6 +69,10 @@ Section "VcXsrv (required)" Delete "$INSTDIR\msvcr100.dll"
IfFileExists "$INSTDIR\msvcp100.dll" 0 +2
Delete "$INSTDIR\msvcp100.dll"
+ IfFileExists "$INSTDIR\msvcr110.dll" 0 +2
+ Delete "$INSTDIR\msvcr110.dll"
+ IfFileExists "$INSTDIR\msvcp110.dll" 0 +2
+ Delete "$INSTDIR\msvcp110.dll"
; Put files there
File "..\obj64\servrelease\vcxsrv.exe"
@@ -105,8 +109,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 "msvcr110.dll"
- File "msvcp110.dll"
+ File "msvcr120.dll"
+ File "msvcp120.dll"
SetOutPath $INSTDIR\xkbdata
File /r "..\xkbdata\*.*"
SetOutPath $INSTDIR\locale
@@ -230,10 +234,10 @@ Section "Uninstall" Delete "$INSTDIR\libxml2.dll"
Delete "$INSTDIR\zlib1.dll"
Delete "$INSTDIR\iconv.dll"
- Delete "$INSTDIR\msvcr110.dll"
- Delete "$INSTDIR\msvcp110.dll"
- Delete "$INSTDIR\msvcr110d.dll"
- Delete "$INSTDIR\msvcp110d.dll"
+ Delete "$INSTDIR\msvcr120.dll"
+ Delete "$INSTDIR\msvcp120.dll"
+ Delete "$INSTDIR\msvcr120d.dll"
+ Delete "$INSTDIR\msvcp120d.dll"
RMDir /r "$INSTDIR\fonts"
RMDir /r "$INSTDIR\xkbdata"
|