Merge remote-tracking branch 'origin/master' into 1.6

2023-05-28 16:34:38 +02:00
parent ad1c573678 311637616b
commit 81ae687238
38 changed files with 503 additions and 124 deletions
@@ -325,6 +325,7 @@ namespace Flax.Build.Platforms

            // Setup arguments shared by all source files
            var commonArgs = new List<string>();
+            commonArgs.AddRange(options.CompileEnv.CustomArgs);
            SetupCompileCppFilesArgs(graph, options, commonArgs, outputPath);
            {
                commonArgs.Add("-c");
@@ -511,6 +512,7 @@ namespace Flax.Build.Platforms

            // Setup arguments
            var args = new List<string>();
+            args.AddRange(options.LinkEnv.CustomArgs);
            {
                args.Add(string.Format("-o \"{0}\"", outputFilePath));