From d0077e9876deef8498087183c279ab83258278e0 Mon Sep 17 00:00:00 2001 From: skyjake Date: Wed, 28 Sep 2011 08:17:47 +0300 Subject: [PATCH] Win32: Include msvcr100.dll in the distribution As libpng and libcurl have been compiled with VC++ 10.0, they are dependent on msvcr100.dll. This shared library is part of the MSVC2010 redistributable files and is not found by default on Windows installations. The Windows build is now working on 64-bit Windows 7 (running as 32-bit) as well as 32-bit Windows. --- distrib/win32/dorel.bat | 3 +++ distrib/win32/setup.iss.template | 1 + 2 files changed, 4 insertions(+) diff --git a/distrib/win32/dorel.bat b/distrib/win32/dorel.bat index 202d05b194..3535718523 100644 --- a/distrib/win32/dorel.bat +++ b/distrib/win32/dorel.bat @@ -13,6 +13,9 @@ cd ..\..\snowberry call build.bat cd ..\distrib\win32 +REM -- Extra dependencies. +copy %windir%\system32\msvcr100.dll ..\products + REM -- Recompile. SET BUILDFAILURE=0 rd/s/q work diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template index ecb3fcf69f..6c90c8846a 100644 --- a/distrib/win32/setup.iss.template +++ b/distrib/win32/setup.iss.template @@ -71,6 +71,7 @@ Source: "lzss.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engi Source: "zlib1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine Source: "libpng15.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine Source: "libcurl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine +Source: "msvcr100.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine ; Snowberry Source: "..\..\snowberry\dist\*"; DestDir: "{app}\snowberry"; Flags: ignoreversion; Components: Launcher