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

Add better win32 resource file injection to be done during linker call

Browse Source
This commit is contained in:
Wojtek Figat
2023-11-15 23:22:26 +01:00
parent ee6a311406
commit 6cad1e3309
7 changed files with 19 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build/Build/EngineTarget.cs
View File

@@ -70,6 +70,7 @@ namespace Flax.Build
Modules.Add("Main");
Modules.Add("Engine");
Win32ResourceFile = Path.Combine(Globals.EngineRoot, "Source", "FlaxEngine.rc");
}
/// <inheritdoc />
@@ -194,6 +195,7 @@ namespace Flax.Build
mainModuleOptions.SourcePaths.Add(mainModule.FolderPath);
mainModule.Setup(mainModuleOptions);
mainModuleOptions.MergeSourcePathsIntoSourceFiles();
mainModuleOptions.CompileEnv.PrecompiledHeaderUsage = PrecompiledHeaderFileUsage.None;
mainModuleOptions.CompileEnv.PreprocessorDefinitions.Add("FLAXENGINE_API=" + buildOptions.Toolchain.DllImport);
Builder.BuildModuleInner(buildData, mainModule, mainModuleOptions, false);

3
Source/Tools/Flax.Build/Build/NativeCpp/LinkEnvironment.cs
View File

@@ -127,8 +127,7 @@ namespace Flax.Build.NativeCpp
LinkAsConsoleProgram = LinkAsConsoleProgram,
GenerateDocumentation = GenerateDocumentation
};
foreach (var e in InputFiles)
clone.InputFiles.Add(e);
clone.InputFiles.AddRange(InputFiles);
clone.DocumentationFiles.AddRange(DocumentationFiles);
clone.InputLibraries.AddRange(InputLibraries);
clone.LibraryPaths.AddRange(LibraryPaths);