From 4492449b73121eb05e3030b662a9d3dfa4a6a2f0 Mon Sep 17 00:00:00 2001 From: walon Date: Fri, 23 Jun 2023 16:19:58 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E4=BB=8E=E5=AF=BC?= =?UTF-8?q?=E5=87=BAxcode=E9=A1=B9=E7=9B=AE=E5=8C=85=E5=90=AB=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=AF=BC=E8=87=B4=E4=BC=A0=E9=80=81?= =?UTF-8?q?=E5=88=B0=E5=85=B6=E4=BB=96=E6=9C=BA=E5=99=A8=E4=B8=8A=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=97=B6=E6=89=BE=E4=B8=8D=E5=88=B0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddLil2cppSourceCodeToXcodeproj2021OrOlder.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Editor/BuildProcessors/AddLil2cppSourceCodeToXcodeproj2021OrOlder.cs b/Editor/BuildProcessors/AddLil2cppSourceCodeToXcodeproj2021OrOlder.cs index c43bda6..84cfaca 100644 --- a/Editor/BuildProcessors/AddLil2cppSourceCodeToXcodeproj2021OrOlder.cs +++ b/Editor/BuildProcessors/AddLil2cppSourceCodeToXcodeproj2021OrOlder.cs @@ -62,6 +62,11 @@ namespace HybridCLR.Editor ModifyPBXProject(pathToBuiltProject, pbxprojFile, lumpFiles, extraSources, cflags); } + private static string GetRelativePathFromProj(string path) + { + return path.Substring(path.IndexOf("Libraries")); + } + private static void ModifyPBXProject(string pathToBuiltProject, string pbxprojFile, List lumpFiles, List extraFiles, List cflags) { var proj = new PBXProject(); @@ -80,14 +85,16 @@ namespace HybridCLR.Editor foreach (var lumpFile in lumpFiles) { - string projPathOfFile = $"Classes/Lumps/{Path.GetFileName(lumpFile.lumpFile)}"; + string lumpFileName = Path.GetFileName(lumpFile.lumpFile); + string projPathOfFile = $"Classes/Lumps/{lumpFileName}"; + string relativePathOfFile = GetRelativePathFromProj(lumpFile.lumpFile); string lumpGuid = proj.FindFileGuidByProjectPath(projPathOfFile); if (!string.IsNullOrEmpty(lumpGuid)) { proj.RemoveFileFromBuild(targetGUID, lumpGuid); proj.RemoveFile(lumpGuid); } - lumpGuid = proj.AddFile(lumpFile.lumpFile, projPathOfFile, PBXSourceTree.Source); + lumpGuid = proj.AddFile(relativePathOfFile, projPathOfFile, PBXSourceTree.Source); proj.AddFileToBuild(targetGUID, lumpGuid); } @@ -101,7 +108,7 @@ namespace HybridCLR.Editor proj.RemoveFile(extraFileGuid); //Debug.LogWarning($"remove exist extra file:{projPathOfFile} guid:{extraFileGuid}"); } - var lumpGuid = proj.AddFile(extraFile, projPathOfFile, PBXSourceTree.Source); + var lumpGuid = proj.AddFile(GetRelativePathFromProj(extraFile), projPathOfFile, PBXSourceTree.Source); proj.AddFileToBuild(targetGUID, lumpGuid); } @@ -182,7 +189,7 @@ namespace HybridCLR.Editor var lumpFileContent = new List(); foreach (var file in cppFiles) { - lumpFileContent.Add($"#include \"{file}\""); + lumpFileContent.Add($"#include \"{GetRelativePathFromProj(file)}\""); } File.WriteAllLines(lumpFile, lumpFileContent, Encoding.UTF8); Debug.Log($"create lump file:{lumpFile}");