Commit d208d149 authored by David Cole's avatar David Cole Committed by Kitware Robot

Merge topic 'windows-ce'

6b40e1ba VS: Ignore LIBC.lib when linking the CompilerId executables
8e85822e VS: Add the entry point when compiling for WindowsCE
5bf9fd82 VS: Set the correct SubSystem when determinating the CompilerId
parents a4e0bba9 6b40e1ba
......@@ -228,7 +228,3 @@ int main(int argc, char* argv[])
return require;
}
#endif
#ifdef ADD_MAINCRTSTARTUP
void mainCRTStartup() {}
#endif
......@@ -210,7 +210,3 @@ int main(int argc, char* argv[])
(void)argv;
return require;
}
#ifdef ADD_MAINCRTSTARTUP
extern "C" void mainCRTStartup() {}
#endif
......@@ -141,7 +141,10 @@ Id flags: ${testflags}
set(id_toolset "")
endif()
if(CMAKE_VS_WINCE_VERSION)
set(id_definitions "ADD_MAINCRTSTARTUP")
set(id_entrypoint "mainACRTStartup")
set(id_subsystem 9)
else()
set(id_subsystem 1)
endif()
if("${CMAKE_MAKE_PROGRAM}" MATCHES "[Mm][Ss][Bb][Uu][Ii][Ll][Dd]")
set(build /p:Configuration=Debug /p:Platform=@id_arch@ /p:VisualStudioVersion=${vs_version}.0)
......
......@@ -24,7 +24,6 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="@id_definitions@"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
......@@ -35,8 +34,10 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="false"
SubSystem="1"
SubSystem="@id_subsystem@"
EntryPointSymbol="@id_entrypoint@"
/>
<Tool
Name="VCPostBuildEventTool"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment