From a453a0f69e2e1e51d87fd33c5ff39bad0f1d5a76 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Sun, 21 Nov 2010 20:35:26 +0000 Subject: [PATCH] - bugfix: In the vc9-x64-debug configuration, assimp_cmd was set to Win32. - inno setup: use silent install mode for msvc runtime redistributables. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@862 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- packaging/windows-innosetup/script.iss | 4 ++-- packaging/windows-innosetup/script_vieweronly.iss | 2 +- workspaces/vc9/assimp.sln | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packaging/windows-innosetup/script.iss b/packaging/windows-innosetup/script.iss index c52964c70..a4bc0bf78 100644 --- a/packaging/windows-innosetup/script.iss +++ b/packaging/windows-innosetup/script.iss @@ -38,8 +38,8 @@ Name: "assimp_net"; Description: "C#/.NET Bindings"; Types: full ;Name: "vc9"; Description: "VC9 project files"; Types: full [Run] -Filename: "{app}\stub\vcredist_x86.exe"; StatusMsg: "Installing VS2008 SP1 redistributable package (32 Bit)"; Check: not IsWin64 -Filename: "{app}\stub\vcredist_x64.exe"; StatusMsg: "Installing VS2008 SP1 redistributable package (64 Bit)"; Check: IsWin64 +Filename: "{app}\stub\vcredist_x86.exe"; Parameters: "/qb"; StatusMsg: "Installing VS2008 SP1 redistributable package (32 Bit)"; Check: not IsWin64 +Filename: "{app}\stub\vcredist_x64.exe"; Parameters: "/qb"; StatusMsg: "Installing VS2008 SP1 redistributable package (64 Bit)"; Check: IsWin64 [Files] diff --git a/packaging/windows-innosetup/script_vieweronly.iss b/packaging/windows-innosetup/script_vieweronly.iss index 90498057f..da726e361 100644 --- a/packaging/windows-innosetup/script_vieweronly.iss +++ b/packaging/windows-innosetup/script_vieweronly.iss @@ -12,7 +12,7 @@ SetupIconFile=..\..\tools\shared\assimp_tools_icon.ico WizardImageFile=compiler:WizModernImage-IS.BMP WizardSmallImageFile=compiler:WizModernSmallImage-IS.BMP LicenseFile=License.rtf -OutputBaseFileName=assimp-view-1.1-setup +OutputBaseFileName=assimp-view-2.0-setup VersionInfoVersion=2.0.0.0 VersionInfoTextVersion=2.0 VersionInfoCompany=Assimp Development Team diff --git a/workspaces/vc9/assimp.sln b/workspaces/vc9/assimp.sln index d797e6a88..5bcd11624 100644 --- a/workspaces/vc9/assimp.sln +++ b/workspaces/vc9/assimp.sln @@ -103,6 +103,7 @@ Global {5691E159-2D9B-407F-971F-EA5C592DC524}.release-st|x64.ActiveCfg = release-st|x64 {5691E159-2D9B-407F-971F-EA5C592DC524}.release-st|x64.Build.0 = release-st|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug|Win32.ActiveCfg = debug|Win32 + {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug|Win32.Build.0 = debug|Win32 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug|x64.ActiveCfg = debug|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug|x64.Build.0 = debug|x64 {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.debug-dll|Win32.ActiveCfg = debug-dll|Win32 @@ -134,7 +135,8 @@ Global {9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.release-st|x64.Build.0 = release-st|x64 {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug|Win32.ActiveCfg = Debug|Win32 {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug|Win32.Build.0 = Debug|Win32 - {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug|x64.ActiveCfg = Debug|Win32 + {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug|x64.ActiveCfg = Debug|x64 + {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug|x64.Build.0 = Debug|x64 {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|Win32.ActiveCfg = debug-dll|Win32 {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|Win32.Build.0 = debug-dll|Win32 {7C8F7B44-C990-4EA8-A2A5-9028472E0AD3}.debug-dll|x64.ActiveCfg = debug-dll|x64