qmake vc(x)proj generator: set the output directory

The configuration property OutDir was always set to ".\\".
We're now referencing "$(OutDir)" instead of building the path every time from
DESTDIR.
Also, VCConfiguration::PrimaryOutput was always empty for VS < 2010 and is now
unused.
The variable MSVCPROJ_LIBOPTIONS was removed.

Task-number: QTBUG-16490
Reviewed-by: Marius Storm-Olsen

1 files changed, 8 insertions, 37 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 0df33d0..b2e5959 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -878,22 +878,16 @@ void VcprojGenerator::initConfiguration()
         break;
     }
 
+    conf.OutputDirectory = project->first("DESTDIR");
+    if (conf.OutputDirectory.isEmpty())
+        conf.OutputDirectory = ".\\";
+    if (!conf.OutputDirectory.endsWith("\\"))
+        conf.OutputDirectory += '\\';
     if (conf.CompilerVersion >= NET2010) {
-        conf.OutputDirectory = project->first("DESTDIR");
-
-        if(conf.OutputDirectory.isEmpty())
-            conf.OutputDirectory = ".\\";
-
-        if(!conf.OutputDirectory.endsWith("\\"))
-            conf.OutputDirectory += '\\';
-
         // The target name could have been changed.
         conf.PrimaryOutput = project->first("TARGET");
         if ( !conf.PrimaryOutput.isEmpty() && !project->first("TARGET_VERSION_EXT").isEmpty() && project->isActiveConfig("shared"))
             conf.PrimaryOutput.append(project->first("TARGET_VERSION_EXT"));
-    } else {
-        conf.PrimaryOutput = project->first("PrimaryOutput");
-        conf.OutputDirectory = ".";
     }
 
     conf.Name = project->values("BUILD_NAME").join(" ");
@@ -982,13 +976,7 @@ void VcprojGenerator::initCompilerTool()
 void VcprojGenerator::initLibrarianTool()
 {
     VCConfiguration &conf = vcProject.Configuration;
-    conf.librarian.OutputFile = project->first("DESTDIR");
-    if(conf.librarian.OutputFile.isEmpty())
-        conf.librarian.OutputFile = ".\\";
-
-    if(!conf.librarian.OutputFile.endsWith("\\"))
-        conf.librarian.OutputFile += '\\';
-
+    conf.librarian.OutputFile = "$(OutDir)\\";
     conf.librarian.OutputFile += project->first("MSVCPROJ_TARGET");
     conf.librarian.AdditionalOptions += project->values("QMAKE_LIBFLAGS");
 }
@@ -1018,24 +1006,7 @@ void VcprojGenerator::initLinkerTool()
         }
     }
 
-    switch (projectTarget) {
-    case Application:
-        conf.linker.OutputFile = project->first("DESTDIR");
-        break;
-    case SharedLib:
-        conf.linker.parseOptions(project->values("MSVCPROJ_LIBOPTIONS"));
-        conf.linker.OutputFile = project->first("DESTDIR");
-        break;
-    case StaticLib: //unhandled - added to remove warnings..
-        break;
-    }
-
-    if(conf.linker.OutputFile.isEmpty())
-        conf.linker.OutputFile = ".\\";
-
-    if(!conf.linker.OutputFile.endsWith("\\"))
-        conf.linker.OutputFile += '\\';
-
+    conf.linker.OutputFile = "$(OutDir)\\";
     conf.linker.OutputFile += project->first("MSVCPROJ_TARGET");
 
     if(project->isActiveConfig("dll")){
@@ -1054,7 +1025,7 @@ void VcprojGenerator::initResourceTool()
     if(project->isActiveConfig("debug"))
         conf.resource.PreprocessorDefinitions += "_DEBUG";
     if(project->isActiveConfig("staticlib"))
-        conf.resource.ResourceOutputFileName = project->first("DESTDIR") + "/$(InputName).res";
+        conf.resource.ResourceOutputFileName = "$(OutDir)\\$(InputName).res";
 }
 
 void VcprojGenerator::initIDLTool()