From 6d8fefe38077f4d532c256e79cfcaf2a46c5269d Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 12 Nov 2013 16:58:49 +0100 Subject: Now use visual studio 2013 express edition for compilation --- xorg-server/installer/vcxsrv-64-debug.nsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'xorg-server/installer/vcxsrv-64-debug.nsi') diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index 470d9c6b8..f93a32c78 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -65,6 +65,10 @@ Section "VcXsrv debug exe and dlls" Delete "$INSTDIR\msvcr100d.dll" IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2 Delete "$INSTDIR\msvcp100d.dll" + IfFileExists "$INSTDIR\msvcr110d.dll" 0 +2 + Delete "$INSTDIR\msvcr110d.dll" + IfFileExists "$INSTDIR\msvcp110d.dll" 0 +2 + Delete "$INSTDIR\msvcp110d.dll" ; Put files there File "..\obj64\servdebug\vcxsrv.exe" @@ -86,8 +90,8 @@ Section "VcXsrv debug exe and dlls" File "..\..\libX11\obj64\debug\libX11.dll" File "..\..\libXext\src\obj64\debug\libXext.dll" File "..\..\libXmu\src\obj64\debug\libXmu.dll" - File "msvcr110d.dll" - File "msvcp110d.dll" + File "msvcr120d.dll" + File "msvcp120d.dll" WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR SectionEnd -- cgit v1.2.3