From b637dd6181bddab0e80aa0c04f96dfecb3f5cd51 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 16 Sep 2021 19:09:03 +0300 Subject: Use common Cpp.resourceCompilerOutput{Tags|Artifacts} functions ... to unify a codebase. Resource output artifacts are now tagged with the 'res' instead of the 'obj' as before (also the output file extensions are also changed from '*.obj' to '*.res'). This only affected to the additional processing for the new 'res' tags in the linker rules for the MSVC and the MinGW. The reason for adding the new 'res' tag is that for some compilers (e.g. the future Open Watcom), the resource files must be linked using the special flags (and not passed as like regular object files to the linker). Change-Id: Ibfc52a384816d3769a7c1f6564db079c118011a0 Reviewed-by: Christian Kandeler --- share/qbs/modules/cpp/gcc.js | 1 + 1 file changed, 1 insertion(+) (limited to 'share/qbs/modules/cpp/gcc.js') diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index 120e601a5..f7581d09b 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -426,6 +426,7 @@ function linkerFlags(project, product, inputs, outputs, primaryOutput, linkerPat args.push("-o", primaryOutput.filePath); args = args.concat(Cpp.collectLinkerObjectPaths(inputs)); + args = args.concat(Cpp.collectResourceObjectPaths(inputs)); for (i in frameworks) { frameworkExecutablePath = PathTools.frameworkExecutablePath(frameworks[i]); -- cgit v1.2.3