--- cmLocalVisualStudio7Generator.cxx	Mon Jun 28 11:07:06 2010
+++ cmLocalVisualStudio7Generator.cxx	Tue Oct 12 11:52:51 2010
@@ -660,11 +660,6 @@ void cmLocalVisualStudio7Generator::Writ
   targetOptions.SetVerboseMakefile(
     this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));
 
-  // Add a definition for the configuration name.
-  std::string configDefine = "CMAKE_INTDIR=\"";
-  configDefine += configName;
-  configDefine += "\"";
-  targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
   if(const char* exportMacro = target.GetExportMacro())
@@ -672,6 +667,15 @@ void cmLocalVisualStudio7Generator::Writ
     targetOptions.AddDefine(exportMacro);
     }
 
+  // only needed for midl 
+  Options targetOptionsExclIntDir = targetOptions;
+
+  // Add a definition for the configuration name.
+  std::string configDefine = "CMAKE_INTDIR=\"";
+  configDefine += configName;
+  configDefine += "\"";
+  targetOptions.AddDefine(configDefine);
+	
   // The intermediate directory name consists of a directory for the
   // target and a subdirectory for the configuration name.
   std::string intermediateDir = this->GetTargetDirectory(target);
@@ -720,8 +724,13 @@ void cmLocalVisualStudio7Generator::Writ
          << this->ConvertToXMLOutputPath(modDir.c_str())
          << "\\$(ConfigurationName)\"\n";
     }
+	
+  std::string fullPathToIntDir = this->Makefile->GetCurrentOutputDirectory();
+  fullPathToIntDir += "/";
+  fullPathToIntDir += intermediateDir;
+	
   targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
-  fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
+  fout << "\t\t\t\tAdditionalIncludeDirectories=\"" << this->ConvertToXMLOutputPath(fullPathToIntDir.c_str()) << ";";
   std::vector<std::string> includes;
   this->GetIncludeDirectories(includes);
   std::vector<std::string>::iterator i = includes.begin();
@@ -768,7 +777,7 @@ void cmLocalVisualStudio7Generator::Writ
     tool = "VFResourceCompilerTool";
     }
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n"
-       << "\t\t\t\tAdditionalIncludeDirectories=\"";
+       << "\t\t\t\tAdditionalIncludeDirectories=\"" << this->ConvertToXMLOutputPath(fullPathToIntDir.c_str()) << ";";
   for(i = includes.begin();i != includes.end(); ++i)
     {
     std::string ipath = this->ConvertToXMLOutputPath(i->c_str());
@@ -784,7 +793,12 @@ void cmLocalVisualStudio7Generator::Writ
     tool = "VFMIDLTool";
     }
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n";
-  targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
+
+  // workaround for bug in midl which chokes on the quoted defines handed from the ide
+  targetOptionsExclIntDir.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
+  std::string configDefineEsc = this->EscapeForShell(configDefine.c_str(), true);
+  configDefineEsc = this->EscapeForXML(configDefineEsc.c_str());
+  fout << "\t\t\t\tAdditionalOptions=\"/D" + configDefineEsc + "\"\n";
   fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n";
   if( this->PlatformName == "x64" )
     {
@@ -799,7 +813,7 @@ void cmLocalVisualStudio7Generator::Writ
     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\tTypeLibraryName=\"" << this->ConvertToXMLOutputPath(fullPathToIntDir.c_str()) << "\\$(InputName).tlb\"\n";
   fout << "\t\t\t\tOutputDirectory=\"$(IntDir)\"\n";
   fout << "\t\t\t\tHeaderFileName=\"$(InputName).h\"\n";
   fout << "\t\t\t\tDLLDataFileName=\"\"\n";
@@ -829,7 +843,10 @@ void cmLocalVisualStudio7Generator::Writ
     }
 
   this->OutputTargetRules(fout, configName, target, libName);
-  this->OutputBuildTool(fout, configName, target, targetOptions.IsDebug());
+  bool isDebug = false;
+  if (strcmp(configName,"Debug") == 0)
+	isDebug = true;
+  this->OutputBuildTool(fout, configName, target, isDebug);
   fout << "\t\t</Configuration>\n";
 }