From 9f58078d7f23cb8708bec4117e72deca3fa2c0eb Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Tue, 15 Mar 2022 13:14:09 +0100 Subject: Unity build: prevent conflict between ungrouped and grouped batches --- xmake/rules/c++/unity_build/unity_build.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmake/rules/c++/unity_build/unity_build.lua') diff --git a/xmake/rules/c++/unity_build/unity_build.lua b/xmake/rules/c++/unity_build/unity_build.lua index 8d770ec02..d334c4970 100644 --- a/xmake/rules/c++/unity_build/unity_build.lua +++ b/xmake/rules/c++/unity_build/unity_build.lua @@ -90,7 +90,7 @@ function main(target, sourcebatch) local dependfile = sourcebatch.dependfiles[idx] local fileconfig = target:fileconfig(sourcefile) if fileconfig and fileconfig.unity_group then - sourcefile_unity = path.join(sourcedir, "unity_" .. fileconfig.unity_group .. path.extension(sourcefile)) + sourcefile_unity = path.join(sourcedir, "unity_group_" .. fileconfig.unity_group .. path.extension(sourcefile)) elseif (fileconfig and fileconfig.unity_ignored) or (batchsize and batchsize <= 1) then -- we do not add these files to unity file table.insert(sourcefiles, sourcefile) -- cgit v1.3.1