Merge topic 'windows-ce'
6b40e1b
VS: Ignore LIBC.lib when linking the CompilerId executables8e85822
VS: Add the entry point when compiling for WindowsCE5bf9fd8
VS: Set the correct SubSystem when determinating the CompilerId
This commit is contained in:
commit
d208d1494f
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue