Skip to content

Commit

Permalink
Installer now includes runtime redistributable. 64 Bit support enable…
Browse files Browse the repository at this point in the history
…d. Add dummy readme and instructions how to build the installer using Inno Setup.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@643 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
  • Loading branch information
aramis_acg committed Apr 4, 2010
1 parent 418033e commit 313ece9
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 1 deletion.
12 changes: 12 additions & 0 deletions packaging/windows-innosetup/howto-build-setup.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@


1) Get MS VC 2005 SP1 redist packages for x86 and amd64 (currently http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647&displaylang=en, http://www.microsoft.com/downloads/details.aspx?familyid=EB4EBE2D-33C0-4A47-9DD4-B9A6D7BD44DA&displaylang=en) and copy 'em right here.

vcredist_x86.exe
vcredist_x64.exe

2) Build assimp, assimpcmd and assimpview for the 'release-dll' target and both the Win32 and x64 architectures.

3) Get Inno Setup
4) Compile, output is written to the 'out' folder.

15 changes: 15 additions & 0 deletions packaging/windows-innosetup/readme_installer.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Open Asset Import Library (Assimp) SDK Installer
Release Notes



Known Bugs & Limitations
========================



Troubleshooting
===============

1. Missing d3dx9_42.dll?
Install the latest DirectX runtime or grab the file from somewhere (that's evil but mostly fine).
15 changes: 14 additions & 1 deletion packaging/windows-innosetup/script.iss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ LicenseFile=License.rtf
OutputBaseFileName=assimp-sdk-1.1rc-setup
VersionInfoVersion=1.1.0.0
VersionInfoTextVersion=1.1rc
VersionInfoCompany=Assimp Development Team
ArchitecturesInstallIn64BitMode=x64

[Types]
Name: "full"; Description: "Full installation"
Expand All @@ -33,8 +35,18 @@ Name: "dassimp"; Description: "D Bindings"; Types: full
;Name: "vc8"; Description: "VC8 project files"; Types: full
;Name: "vc9"; Description: "VC9 project files"; Types: full

[Run]
Filename: "{app}\stub\vcredist_x86.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (32 Bit)"; Check: not IsWin64
Filename: "{app}\stub\vcredist_x64.exe"; StatusMsg: "Installing VS2005 SP1 redistributable package (64 Bit)"; Check: IsWin64

[Files]

Source: "readme_installer.txt"; DestDir: "{app}"; Flags: isreadme

; Installer stub
Source: "vcredist_x86.exe"; DestDir: "{app}\stub\"; Check: not IsWin64
Source: "vcredist_x64.exe"; DestDir: "{app}\stub\"; Check: IsWin64

; Common stuff
Source: "..\..\CREDITS"; DestDir: "{app}"
Source: "..\..\LICENSE"; DestDir: "{app}"
Expand Down Expand Up @@ -86,4 +98,5 @@ Source: "..\..\test\models\*"; DestDir: "{app}\test\models"; Flags: recursesubdi
[Icons]
Name: "{group}\Assimp Manual"; Filename: "{app}\doc\AssimpDoc.chm" ; Components: help
Name: "{group}\Assimp Command Line Manual"; Filename: "{app}\doc\AssimpCmdDoc.chm"; Components: help
Name: "{group}\AssimpView"; Filename: "{app}\bin\x86\assimp_view.exe"; Components: tools
Name: "{group}\AssimpView"; Filename: "{app}\bin\x64\assimp_view.exe"; Components: tools; Check: IsWin64
Name: "{group}\AssimpView"; Filename: "{app}\bin\x86\assimp_view.exe"; Components: tools; Check: not IsWin64

0 comments on commit 313ece9

Please sign in to comment.