GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'GoaLitiuM-csproj_file_structure'

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-22 13:02:42 +02:00
parent bd4efe5f02 da00d3b971
commit faeb21a77a
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
View File

@@ -174,8 +174,35 @@ namespace Flax.Build.Projects.VisualStudio
else
fileType = "None";
var projectPath = Utilities.MakePathRelativeTo(file, projectDirectory);
csProjectFileContent.AppendLine(string.Format(" <{0} Include=\"{1}\" />", fileType, projectPath));
var filePath = file.Replace('/', '\\'); // Normalize path
var projectPath = Utilities.MakePathRelativeTo(filePath, projectDirectory);
string linkPath = null;
if (projectPath.StartsWith(@"..\..\..\"))
{
// Create folder structure for project external files
var sourceIndex = filePath.LastIndexOf(@"\Source\");
if (sourceIndex != -1)
{
projectPath = filePath;
string fileProjectRoot = filePath.Substring(0, sourceIndex);
string fileProjectName = Path.GetFileName(fileProjectRoot);
string fileProjectRelativePath = filePath.Substring(sourceIndex + 1);
// Remove Source-directory from path
if (fileProjectRelativePath.IndexOf('\\') != -1)
fileProjectRelativePath = fileProjectRelativePath.Substring(fileProjectRelativePath.IndexOf('\\') + 1);
if (fileProjectRoot == project.SourceFolderPath)
linkPath = fileProjectRelativePath;
else // BuildScripts project
linkPath = Path.Combine(fileProjectName, fileProjectRelativePath);
}
}
if (!string.IsNullOrEmpty(linkPath))
csProjectFileContent.AppendLine(string.Format(" <{0} Include=\"{1}\" Link=\"{2}\" />", fileType, projectPath, linkPath));
else
csProjectFileContent.AppendLine(string.Format(" <{0} Include=\"{1}\" />", fileType, projectPath));
}
if (project.GeneratedSourceFiles != null)
@@ -188,7 +215,8 @@ namespace Flax.Build.Projects.VisualStudio
else
fileType = "None";
csProjectFileContent.AppendLine(string.Format(" <{0} Visible=\"false\" Include=\"{1}\" />", fileType, file));
var filePath = file.Replace('/', '\\');
csProjectFileContent.AppendLine(string.Format(" <{0} Visible=\"false\" Include=\"{1}\" />", fileType, filePath));
}
}