2 files changed, 29 insertions, 2 deletions
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index b68ffdfa1..2856a9834 100644
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -1,3 +1,19 @@
+@echo off
 if exist vcxsrv.*.installer.exe del vcxsrv.*.installer.exe
+if "%VS2008%"=="1" goto vs2008
+
+copy %systemroot%\system32\msvcr100.dll
+copy %systemroot%\system32\msvcr100d.dll
+"C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi
+del msvcr100.dll
+del msvcr100d.dll
+
+goto end
+:vs2008
+
 python genruntimeinclude.py
-"C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi
-\ No newline at end of file
+"C:\Program Files\NSIS\makensis.exe" /DVS2008=1 vcxsrv.nsi
+del runtime
+
+:end
+
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 02f31cab6..440b3cb50 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -52,10 +52,11 @@ XPStyle on
 
 !define FUSION_REFCOUNT_UNINSTALL_SUBKEY_GUID {8cedc215-ac4b-488b-93c0-a50a49cb2fb8}
 
+!ifdef VS2008
 !include runtime
+!endif
 
 ;--------------------------------
-
 ; The stuff to install
 Section "VcXsrv (required)"
 
@@ -87,6 +88,10 @@ Section "VcXsrv (required)"
   File "..\..\tools\plink\obj\release\plink.exe"
   File "..\swrast_dri.dll"
   File "..\swrast_dri_dbg.dll"
+!ifndef VS2008
+  File "msvcr100.dll"
+  File "msvcr100d.dll"
+!endif
   SetOutPath $INSTDIR\fonts
   File /r "..\fonts\*.*"
   SetOutPath $INSTDIR\xkbdata
@@ -130,6 +135,7 @@ Section "VcXsrv (required)"
   WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Application" "" "XLaunch"
   WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Topic" "" "System"
 
+!ifdef VS2008
   InitPluginsDir
   SetOutPath $PLUGINSDIR
   File "${MSVCR90_DLL}"
@@ -176,6 +182,7 @@ faildebugcrt:
   DetailPrint $1
   Goto end
 end:
+!endif
 SectionEnd
 
 ; Optional section (can be disabled by the user)
@@ -234,6 +241,10 @@ Section "Uninstall"
   Delete "$INSTDIR\plink.exe"
   Delete "$INSTDIR\swrast_dri.dll"
   Delete "$INSTDIR\swrast_dri_dbg.dll"
+!ifndef VS2008
+  Delete "$INSTDIR\msvcr100.dll"
+  Delete "$INSTDIR\msvcr100d.dll"
+!endif
 
   RMDir /r "$INSTDIR\fonts"
   RMDir /r "$INSTDIR\xkbdata"