kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-wince-unicode-entry-point' into release

This commit is contained in:
Brad King 2014-12-03 09:08:40 -05:00
parent f3ae286cc0 681cda02bf
commit 17e1ead25e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -2267,10 +2267,17 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
{ {
linkOptions.AddFlag("SubSystem", "WindowsCE"); linkOptions.AddFlag("SubSystem", "WindowsCE");
if (this->Target->GetType() == cmTarget::EXECUTABLE) if (this->Target->GetType() == cmTarget::EXECUTABLE)
{
if (this->ClOptions[config]->UsingUnicode())
{
linkOptions.AddFlag("EntryPointSymbol", "wWinMainCRTStartup");
}
else
{ {
linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup"); linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup");
} }
} }
}
else else
{ {
linkOptions.AddFlag("SubSystem", "Windows"); linkOptions.AddFlag("SubSystem", "Windows");
@ -2282,10 +2289,17 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
{ {
linkOptions.AddFlag("SubSystem", "WindowsCE"); linkOptions.AddFlag("SubSystem", "WindowsCE");
if (this->Target->GetType() == cmTarget::EXECUTABLE) if (this->Target->GetType() == cmTarget::EXECUTABLE)
{
if (this->ClOptions[config]->UsingUnicode())
{
linkOptions.AddFlag("EntryPointSymbol", "mainWCRTStartup");
}
else
{ {
linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup"); linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup");
} }
} }
}
else else
{ {
linkOptions.AddFlag("SubSystem", "Console"); linkOptions.AddFlag("SubSystem", "Console");