summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-15 18:12:08 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-02-15 18:12:08 (GMT)
commitbc6b0326b3016f6ffb10f7d9f5e6b8608f28c77e (patch)
treee6da2f73e287600f64d3765fce71e2f5bf05999c
parent3a393cb2da1b744598da23bc01592a910c728c18 (diff)
parentcf82d1e1669a00dee19c241da2207e0b8e65cfbf (diff)
downloadCMake-bc6b0326b3016f6ffb10f7d9f5e6b8608f28c77e.zip
CMake-bc6b0326b3016f6ffb10f7d9f5e6b8608f28c77e.tar.gz
CMake-bc6b0326b3016f6ffb10f7d9f5e6b8608f28c77e.tar.bz2
Merge topic 'windows-ce-vs-subsystem'
cf82d1e VS: Specify WinCE subsystems correctly in VS 9 2008 8f4cae7 VS: Specify WinCE subsystem also for DLLs
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx22
1 files changed, 20 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index f9df861..f07ebef 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1134,6 +1134,17 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
{
fout << "\t\t\t\tGenerateDebugInformation=\"TRUE\"\n";
}
+ if(this->WindowsCEProject)
+ {
+ if(this->GetVersion() < VS9)
+ {
+ fout << "\t\t\t\tSubSystem=\"9\"\n";
+ }
+ else
+ {
+ fout << "\t\t\t\tSubSystem=\"8\"\n";
+ }
+ }
std::string stackVar = "CMAKE_";
stackVar += linkLanguage;
stackVar += "_STACK_SIZE";
@@ -1223,8 +1234,15 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
}
if ( this->WindowsCEProject )
{
- fout << "\t\t\t\tSubSystem=\"9\"\n"
- << "\t\t\t\tEntryPointSymbol=\""
+ if(this->GetVersion() < VS9)
+ {
+ fout << "\t\t\t\tSubSystem=\"9\"\n";
+ }
+ else
+ {
+ fout << "\t\t\t\tSubSystem=\"8\"\n";
+ }
+ fout << "\t\t\t\tEntryPointSymbol=\""
<< (isWin32Executable ? "WinMainCRTStartup" : "mainACRTStartup")
<< "\"\n";
}