1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcxproj: fix writing of librarian settings

Browse Source 
The settings of the librarian were never written.
Creation of static libraries only worked by accident.
Adapted the code from the vcproj code path.

Task-number: QTBUG-30712
Change-Id: I69917f44305eb458647392d222db477fe5a5b7c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
This commit is contained in:
Joerg Bornemann 2014-10-20 14:40:15 +02:00 committed by Oswald Buddenhagen
parent 6fa2fec1dd
commit d8f940930e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
const char _CLCompile[] = "ClCompile"; const char _CLCompile[] = "ClCompile";
const char _ItemGroup[] = "ItemGroup"; const char _ItemGroup[] = "ItemGroup";
const char _Link[] = "Link"; const char _Link[] = "Link";
const char _Lib[] = "Lib";
const char _ManifestTool[] = "ManifestTool"; const char _ManifestTool[] = "ManifestTool";
const char _Midl[] = "Midl"; const char _Midl[] = "Midl";
const char _ResourceCompile[] = "ResourceCompile"; const char _ResourceCompile[] = "ResourceCompile";
@ -754,8 +755,11 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
// ClCompile // ClCompile
write(xml, config.compiler); write(xml, config.compiler);
// Link // Librarian / Linker
write(xml, config.linker); if (config.ConfigurationType == typeStaticLibrary)
write(xml, config.librarian);
else
write(xml, config.linker);
// Midl // Midl
write(xml, config.idl); write(xml, config.idl);
@ -1683,7 +1687,7 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCCustomBuildTool &tool)
void VCXProjectWriter::write(XmlOutput &xml, const VCLibrarianTool &tool) void VCXProjectWriter::write(XmlOutput &xml, const VCLibrarianTool &tool)
{ {
xml xml
<< tag(_Link) << tag(_Lib)
<< attrTagX(_AdditionalDependencies, tool.AdditionalDependencies, ";") << attrTagX(_AdditionalDependencies, tool.AdditionalDependencies, ";")
<< attrTagX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories, ";") << attrTagX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories, ";")
<< attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ") << attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ")
@ -1703,7 +1707,7 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCLibrarianTool &tool)
//unused << attrTagS(_TargetMachine, tool.TargetMachine) //unused << attrTagS(_TargetMachine, tool.TargetMachine)
//unused << attrTagT(_TreatLibWarningAsErrors, tool.TreatLibWarningAsErrors) //unused << attrTagT(_TreatLibWarningAsErrors, tool.TreatLibWarningAsErrors)
//unused << attrTagT(_Verbose, tool.Verbose) //unused << attrTagT(_Verbose, tool.Verbose)
<< closetag(_Link); << closetag(_Lib);
} }
void VCXProjectWriter::write(XmlOutput &xml, const VCResourceCompilerTool &tool) void VCXProjectWriter::write(XmlOutput &xml, const VCResourceCompilerTool &tool)