--- Source/cmVisualStudio10TargetGenerator.cxx	Sun Nov 14 13:30:43 2010
+++ cmVisualStudio10TargetGeneratorNoObjHdrs.cxx	Sun Nov 14 13:48:57 2010
@@ -659,6 +659,8 @@
     // TODO: need to check for idl or rc
     if(!(*source)->GetCustomCommand())
       {
+      if ((*source)->GetExtension() == "obj")
+        continue;
       bool header = (*source)->GetPropertyAsBool("HEADER_FILE_ONLY")
         || this->GlobalGenerator->IgnoreFile
         ((*source)->GetExtension().c_str());

@@ -112,11 +112,11 @@ std::string cmGlobalVisualStudio10Generator::GetUserMacrosRegKeyBase()
 
 std::string cmGlobalVisualStudio10Generator
 ::GenerateBuildCommand(const char* makeProgram,
                        const char *projectName, 
                        const char* additionalOptions, const char *targetName,
-                       const char* config, bool ignoreErrors, bool)
+                       const char* config, bool ignoreErrors, bool fast)
 {
   // Ingoring errors is not implemented in visual studio 6
   (void) ignoreErrors;
 
   
@@ -124,10 +124,18 @@ std::string cmGlobalVisualStudio10Generator
   std::string makeCommand 
     = cmSystemTools::ConvertToOutputPath(makeProgram);
   std::string lowerCaseCommand = makeCommand;
   cmSystemTools::LowerCase(lowerCaseCommand);
 
+  // check for devenv and use corresponding options
+  if (makeCommand.find("devenv") != std::string::npos) {
+     return cmGlobalVisualStudio7Generator::GenerateBuildCommand(
+        makeProgram,projectName,additionalOptions,
+        targetName,config,ignoreErrors,fast);
+  } 
+
+
   // if there are spaces in the makeCommand, assume a full path
   // and convert it to a path with no spaces in it as the
   // RunSingleCommand does not like spaces
   if(makeCommand.find(' ') != std::string::npos)
     {