Merge branch 'fix-wince-unicode-entry-point' into release
This commit is contained in:
commit
17e1ead25e
|
@ -2267,10 +2267,17 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
|
|||
{
|
||||
linkOptions.AddFlag("SubSystem", "WindowsCE");
|
||||
if (this->Target->GetType() == cmTarget::EXECUTABLE)
|
||||
{
|
||||
if (this->ClOptions[config]->UsingUnicode())
|
||||
{
|
||||
linkOptions.AddFlag("EntryPointSymbol", "wWinMainCRTStartup");
|
||||
}
|
||||
else
|
||||
{
|
||||
linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup");
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
linkOptions.AddFlag("SubSystem", "Windows");
|
||||
|
@ -2282,10 +2289,17 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
|
|||
{
|
||||
linkOptions.AddFlag("SubSystem", "WindowsCE");
|
||||
if (this->Target->GetType() == cmTarget::EXECUTABLE)
|
||||
{
|
||||
if (this->ClOptions[config]->UsingUnicode())
|
||||
{
|
||||
linkOptions.AddFlag("EntryPointSymbol", "mainWCRTStartup");
|
||||
}
|
||||
else
|
||||
{
|
||||
linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup");
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
linkOptions.AddFlag("SubSystem", "Console");
|
||||
|
|
Loading…
Reference in New Issue