From 61a9070b96839367789b1728b7319789af6676d0 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 17 May 2010 05:53:18 +0000
Subject: Also install msvcp100.dll

---
 xorg-server/installer/packageall.bat | 2 ++
 xorg-server/installer/vcxsrv.nsi     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index 2856a9834..0aa098086 100644
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -3,10 +3,12 @@ if exist vcxsrv.*.installer.exe del vcxsrv.*.installer.exe
 if "%VS2008%"=="1" goto vs2008
 
 copy %systemroot%\system32\msvcr100.dll
+copy %systemroot%\system32\msvcp100.dll
 copy %systemroot%\system32\msvcr100d.dll
 "C:\Program Files\NSIS\makensis.exe" vcxsrv.nsi
 del msvcr100.dll
 del msvcr100d.dll
+del msvcp100.dll
 
 goto end
 :vs2008
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 6a0f18896..cb88c3d32 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -90,6 +90,7 @@ Section "VcXsrv (required)"
   File "..\swrast_dri_dbg.dll"
 !ifndef VS2008
   File "msvcr100.dll"
+  File "msvcp100.dll"
   File "msvcr100d.dll"
 !endif
   SetOutPath $INSTDIR\fonts
@@ -243,6 +244,7 @@ Section "Uninstall"
   Delete "$INSTDIR\swrast_dri_dbg.dll"
 !ifndef VS2008
   Delete "$INSTDIR\msvcr100.dll"
+  Delete "$INSTDIR\msvcp100.dll"
   Delete "$INSTDIR\msvcr100d.dll"
 !endif
 
-- 
cgit v1.2.3