diff options
| -rw-r--r-- | ChangeLog.manual | 2 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog.manual b/ChangeLog.manual index 4d4d30f..5cb3c87 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,5 +1,7 @@ Changes in CMake 2.4.3 +* fix for 3557 - Under MSVC8 hardcoded TargetEnvironment for MIDL Compiler + * Fix for Xcode all projects to prevent -fvisibility=hidden flags. This is needed to make RTTI work by default. diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 436daea..28f930a 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -551,7 +551,18 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, this->OutputDefineFlags(defineFlags.c_str(), fout); fout << "\"\n"; fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n"; - fout << "\t\t\t\tTargetEnvironment=\"1\"\n"; + if( this->PlatformName == "x64" ) + { + fout << "\t\t\t\tTargetEnvironment=\"3\"\n"; + } + else if( this->PlatformName == "ia64" ) + { + fout << "\t\t\t\tTargetEnvironment=\"2\"\n"; + } + else + { + fout << "\t\t\t\tTargetEnvironment=\"1\"\n"; + } fout << "\t\t\t\tGenerateStublessProxies=\"TRUE\"\n"; fout << "\t\t\t\tTypeLibraryName=\"$(InputName).tlb\"\n"; fout << "\t\t\t\tOutputDirectory=\"$(IntDir)\"\n"; |