From f288516b893fc369f2d51b0d75a4b35bf00a91b7 Mon Sep 17 00:00:00 2001 From: yangws Date: Tue, 3 May 2011 14:28:31 +0800 Subject: [PATCH] fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT. --- .../msvc/CCAppWiz.win32/Scripts/1033/default.js | 4 ++-- template/msvc/InstallWizardForVC2008Express.js | 15 ++++++++++++++- template/msvc/InstallWizardForVC2010Express.js | 15 ++++++++++++++- template/msvc/InstallWizardForVS2008.js | 15 ++++++++++++++- template/msvc/InstallWizardForVS2010.js | 15 ++++++++++++++- 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/template/msvc/CCAppWiz.win32/Scripts/1033/default.js b/template/msvc/CCAppWiz.win32/Scripts/1033/default.js index db2cdd43f8..146ec43d7e 100644 --- a/template/msvc/CCAppWiz.win32/Scripts/1033/default.js +++ b/template/msvc/CCAppWiz.win32/Scripts/1033/default.js @@ -205,14 +205,14 @@ function AddConfigurations(proj, strProjectName) { CLTool.UsePrecompiledHeader = pchNone; // pchUseUsingSpecific; CLTool.WarningLevel = warningLevel_3; if (bDebug) { - CLTool.RuntimeLibrary = rtMultiThreadedDebug; + CLTool.RuntimeLibrary = rtMultiThreadedDebugDLL; CLTool.MinimalRebuild = true; CLTool.DebugInformationFormat = debugEditAndContinue; CLTool.BasicRuntimeChecks = runtimeBasicCheckAll; CLTool.Optimization = optimizeDisabled; } else { - CLTool.RuntimeLibrary = rtMultiThreaded; + CLTool.RuntimeLibrary = rtMultiThreadedDLL; CLTool.ExceptionHandling = false; CLTool.DebugInformationFormat = debugDisabled; } diff --git a/template/msvc/InstallWizardForVC2008Express.js b/template/msvc/InstallWizardForVC2008Express.js index 989fa76e30..d8664addff 100644 --- a/template/msvc/InstallWizardForVC2008Express.js +++ b/template/msvc/InstallWizardForVC2008Express.js @@ -2,6 +2,19 @@ main(); +function EchoInfo(bQuiet, strMsg) { + if (! bQuiet) { + WScript.Echo(strMsg); + } + else { + var FileSys = new ActiveXObject("Scripting.FileSystemObject"); + var strLogPath = "InstallWizardLog.txt" + var file = FileSys.OpenTextFile(strLogPath, 8, true); + file.WriteLine(strMsg); + file.Close(); + } +} + function EchoError(bQuiet, strMsg) { strMsg = "Error: " + strMsg; if (! bQuiet) { @@ -226,5 +239,5 @@ function main() { return; } - EchoError(bQuiet, "App Wizard successfully installed for VC2008 Express!"); + EchoInfo(bQuiet, "App Wizard successfully installed for VC2008 Express!"); } diff --git a/template/msvc/InstallWizardForVC2010Express.js b/template/msvc/InstallWizardForVC2010Express.js index 8847bc7657..1b6a05f264 100644 --- a/template/msvc/InstallWizardForVC2010Express.js +++ b/template/msvc/InstallWizardForVC2010Express.js @@ -2,6 +2,19 @@ main(); +function EchoInfo(bQuiet, strMsg) { + if (! bQuiet) { + WScript.Echo(strMsg); + } + else { + var FileSys = new ActiveXObject("Scripting.FileSystemObject"); + var strLogPath = "InstallWizardLog.txt" + var file = FileSys.OpenTextFile(strLogPath, 8, true); + file.WriteLine(strMsg); + file.Close(); + } +} + function EchoError(bQuiet, strMsg) { strMsg = "Error: " + strMsg; if (! bQuiet) { @@ -226,5 +239,5 @@ function main() { return; } - EchoError(bQuiet, "App Wizard successfully installed for VC2010 Express!"); + EchoInfo(bQuiet, "App Wizard successfully installed for VC2010 Express!"); } diff --git a/template/msvc/InstallWizardForVS2008.js b/template/msvc/InstallWizardForVS2008.js index ddcc1699cb..7bbabdccb9 100644 --- a/template/msvc/InstallWizardForVS2008.js +++ b/template/msvc/InstallWizardForVS2008.js @@ -2,6 +2,19 @@ main(); +function EchoInfo(bQuiet, strMsg) { + if (! bQuiet) { + WScript.Echo(strMsg); + } + else { + var FileSys = new ActiveXObject("Scripting.FileSystemObject"); + var strLogPath = "InstallWizardLog.txt" + var file = FileSys.OpenTextFile(strLogPath, 8, true); + file.WriteLine(strMsg); + file.Close(); + } +} + function EchoError(bQuiet, strMsg) { strMsg = "Error: " + strMsg; if (! bQuiet) { @@ -223,5 +236,5 @@ function main() { return; } - EchoError(bQuiet, "App Wizard successfully installed for VS2008!"); + EchoInfo(bQuiet, "App Wizard successfully installed for VS2008!"); } diff --git a/template/msvc/InstallWizardForVS2010.js b/template/msvc/InstallWizardForVS2010.js index 425748a083..34e5407592 100644 --- a/template/msvc/InstallWizardForVS2010.js +++ b/template/msvc/InstallWizardForVS2010.js @@ -2,6 +2,19 @@ main(); +function EchoInfo(bQuiet, strMsg) { + if (! bQuiet) { + WScript.Echo(strMsg); + } + else { + var FileSys = new ActiveXObject("Scripting.FileSystemObject"); + var strLogPath = "InstallWizardLog.txt" + var file = FileSys.OpenTextFile(strLogPath, 8, true); + file.WriteLine(strMsg); + file.Close(); + } +} + function EchoError(bQuiet, strMsg) { strMsg = "Error: " + strMsg; if (! bQuiet) { @@ -223,5 +236,5 @@ function main() { return; } - EchoError(bQuiet, "App Wizard successfully installed for VS2010!"); + EchoInfo(bQuiet, "App Wizard successfully installed for VS2010!"); }