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

Merge branch 'nameof-module-add' of https://github.com/Tryibion/FlaxEngine into Tryibion-nameof-module-add

Browse Source
This commit is contained in:
Wojtek Figat
2024-08-28 16:39:25 +02:00
parent 942e7986be 22cf2570f5
commit 9fa40cbf09
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
View File

@@ -261,7 +261,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
if (!file.Contains("GameProjectTarget"))
continue; // Skip
if (file.Contains("Modules.Add(\"Game\")"))
if (file.Contains("Modules.Add(\"Game\")") || file.Contains("Modules.Add(nameof(Game))"))
{
// Assume Game represents the main game module
moduleName = "Game";

8
Source/Editor/Editor.cpp
View File

@@ -226,7 +226,7 @@ bool Editor::CheckProjectUpgrade()
" base.Init();\n"
"\n"
" // Reference the modules for game\n"
" Modules.Add(\"{0}\");\n"
" Modules.Add(nameof({0}));\n"
" }}\n"
"}}\n"
), codeName), Encoding::UTF8);
@@ -242,7 +242,7 @@ bool Editor::CheckProjectUpgrade()
" base.Init();\n"
"\n"
" // Reference the modules for editor\n"
" Modules.Add(\"{0}\");\n"
" Modules.Add(nameof({0}));\n"
"{1}"
" }}\n"
"}}\n"
@@ -476,7 +476,7 @@ int32 Editor::LoadProduct()
" base.Init();\n"
"\n"
" // Reference the modules for game\n"
" Modules.Add(\"Game\");\n"
" Modules.Add(nameof(Game));\n"
" }\n"
"}\n"), Encoding::UTF8);
failed |= File::WriteAllText(projectPath / TEXT("Source/GameEditorTarget.Build.cs"),TEXT(
@@ -490,7 +490,7 @@ int32 Editor::LoadProduct()
" base.Init();\n"
"\n"
" // Reference the modules for editor\n"
" Modules.Add(\"Game\");\n"
" Modules.Add(nameof(Game));\n"
" }\n"
"}\n"), Encoding::UTF8);
failed |= File::WriteAllText(projectPath / TEXT("Source/Game/Game.Build.cs"),TEXT(

2
Source/Editor/Modules/SourceCodeEditing/CodeEditingModule.cs
View File

@@ -382,7 +382,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
// Get editor target and target files and add module
var files = Directory.GetFiles(path);
var targetModuleText = $"Modules.Add(\"{moduleName}\");\n ";
var targetModuleText = $"Modules.Add(nameof({moduleName}));\n ";
foreach (var file in files)
{
if (!file.Contains(".Build.cs", StringComparison.OrdinalIgnoreCase))