diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-03 14:08:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-03 14:08:40 (GMT) |
| commit | 17e1ead25eeed3fd8f9c2dbeea25698210180a8e (patch) | |
| tree | 5795c0f4b0cba95794a7297637b817ae10bd8fa8 | |
| parent | f3ae286cc09898127aa1d56262678f3e89c30171 (diff) | |
| parent | 681cda02bf656c1cc114632d60afc8bd0cac4b09 (diff) | |
| download | CMake-17e1ead25eeed3fd8f9c2dbeea25698210180a8e.zip CMake-17e1ead25eeed3fd8f9c2dbeea25698210180a8e.tar.gz CMake-17e1ead25eeed3fd8f9c2dbeea25698210180a8e.tar.bz2 | |
Merge branch 'fix-wince-unicode-entry-point' into release
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 1ac13cf..2b73749 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2268,7 +2268,14 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config) linkOptions.AddFlag("SubSystem", "WindowsCE"); if (this->Target->GetType() == cmTarget::EXECUTABLE) { - linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup"); + if (this->ClOptions[config]->UsingUnicode()) + { + linkOptions.AddFlag("EntryPointSymbol", "wWinMainCRTStartup"); + } + else + { + linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup"); + } } } else @@ -2283,7 +2290,14 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config) linkOptions.AddFlag("SubSystem", "WindowsCE"); if (this->Target->GetType() == cmTarget::EXECUTABLE) { - linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup"); + if (this->ClOptions[config]->UsingUnicode()) + { + linkOptions.AddFlag("EntryPointSymbol", "mainWCRTStartup"); + } + else + { + linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup"); + } } } else |