From 71a7890f8cf2cf0214ee729795b1a42cf41b7c99 Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Mon, 23 Aug 2021 10:04:01 +0200 Subject: [PATCH 01/15] Make the version unofficial. --- Sharpmake.Application/Properties/AssemblyInfo.cs | 2 +- Sharpmake.Generators/Properties/AssemblyInfo.cs | 2 +- .../Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs | 2 +- Sharpmake/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs index 8ccbb9649..b807523b4 100644 --- a/Sharpmake.Application/Properties/AssemblyInfo.cs +++ b/Sharpmake.Application/Properties/AssemblyInfo.cs @@ -43,4 +43,4 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.0")] +[assembly: AssemblyVersion("0.17.2.*")] diff --git a/Sharpmake.Generators/Properties/AssemblyInfo.cs b/Sharpmake.Generators/Properties/AssemblyInfo.cs index 0668c12d7..5d80d2099 100644 --- a/Sharpmake.Generators/Properties/AssemblyInfo.cs +++ b/Sharpmake.Generators/Properties/AssemblyInfo.cs @@ -44,6 +44,6 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.0")] +[assembly: AssemblyVersion("0.17.2.*")] [assembly: InternalsVisibleTo("Sharpmake")] diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs index 098921be9..92bbe8a45 100644 --- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs +++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs @@ -44,6 +44,6 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.0")] +[assembly: AssemblyVersion("0.17.2.*")] [assembly: SharpmakeExtension] diff --git a/Sharpmake/Properties/AssemblyInfo.cs b/Sharpmake/Properties/AssemblyInfo.cs index c3b574270..566906cd4 100644 --- a/Sharpmake/Properties/AssemblyInfo.cs +++ b/Sharpmake/Properties/AssemblyInfo.cs @@ -44,9 +44,9 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.0")] +[assembly: AssemblyVersion("0.17.2.*")] #pragma warning disable CS7035 -[assembly: AssemblyFileVersion("0.17.2.0 (LocalBuild)")] +[assembly: AssemblyFileVersion("0.17.2.* (LocalBuild)")] #pragma warning restore [assembly: InternalsVisibleTo("Sharpmake.Application")] From 08bbfb713dd21fcb66d973b4abd8259bb9c22091 Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Mon, 30 Aug 2021 11:36:09 +0200 Subject: [PATCH 02/15] Remove duplications from some lists in bff (most notably prebuild dependencies) --- Sharpmake.Generators/FastBuild/Bff.Util.cs | 2 +- Sharpmake.Generators/FastBuild/Bff.cs | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Sharpmake.Generators/FastBuild/Bff.Util.cs b/Sharpmake.Generators/FastBuild/Bff.Util.cs index 35b4d034d..f350ea2bd 100644 --- a/Sharpmake.Generators/FastBuild/Bff.Util.cs +++ b/Sharpmake.Generators/FastBuild/Bff.Util.cs @@ -159,7 +159,7 @@ public override string Resolve(string rootPath, string bffFilePath, Resolver res using (resolver.NewScopedParameter("fastBuildPrebuildWorkingPath", UtilityMethods.GetNormalizedPathForBuildStep(rootPath, bffFilePath, WorkingPath))) using (resolver.NewScopedParameter("fastBuildPrebuildUseStdOutAsOutput", UseStdOutAsOutput ? "true" : FileGeneratorUtilities.RemoveLineTag)) using (resolver.NewScopedParameter("fastBuildPrebuildAlwaysShowOutput", AlwaysShowOutput ? "true" : FileGeneratorUtilities.RemoveLineTag)) - using (resolver.NewScopedParameter("fastBuildExecPreBuildDependencies", Dependencies.Count > 0 ? UtilityMethods.FBuildFormatList(Dependencies.ToList(), 26) : FileGeneratorUtilities.RemoveLineTag)) + using (resolver.NewScopedParameter("fastBuildExecPreBuildDependencies", Dependencies.Count > 0 ? UtilityMethods.FBuildFormatList(Dependencies.Values, 26) : FileGeneratorUtilities.RemoveLineTag)) using (resolver.NewScopedParameter("fastBuildExecAlways", ExecAlways ? "true" : FileGeneratorUtilities.RemoveLineTag)) { return resolver.Resolve(Bff.Template.ConfigurationFile.GenericExecutableSection); diff --git a/Sharpmake.Generators/FastBuild/Bff.cs b/Sharpmake.Generators/FastBuild/Bff.cs index 4bbb90b20..4ed0954f2 100644 --- a/Sharpmake.Generators/FastBuild/Bff.cs +++ b/Sharpmake.Generators/FastBuild/Bff.cs @@ -392,9 +392,9 @@ List skipFiles bool useObjectLists = confUseLibraryDependencyInputs; string fastBuildOutputFileShortName = GetShortProjectName(project, conf); - var fastBuildProjectDependencies = new List(); - var fastBuildBuildOnlyDependencies = new List(); - var fastBuildProjectExeUtilityDependencyList = new List(); + var fastBuildProjectDependencies = new Strings(); + var fastBuildBuildOnlyDependencies = new Strings(); + var fastBuildProjectExeUtilityDependencyList = new Strings(); bool mustGenerateLibrary = confSubConfigs.Count > 1 && !useObjectLists && isLastSubConfig && isOutputTypeLib; @@ -509,8 +509,8 @@ List skipFiles Strings preBuildTargets = new Strings(); - var fastBuildTargetSubTargets = new List(); - var fastBuildTargetLibraryDependencies = new List(); + var fastBuildTargetSubTargets = new Strings(); + var fastBuildTargetLibraryDependencies = new Strings(); { if (isLastSubConfig) // post-build steps on the last subconfig { @@ -1027,9 +1027,9 @@ List skipFiles using (bffGenerator.Declare("fastBuildResourceFiles", fastBuildResourceFiles)) using (bffGenerator.Declare("fastBuildEmbeddedResources", fastBuildEmbeddedResources)) using (bffGenerator.Declare("fastBuildPrecompiledSourceFile", fastBuildPrecompiledSourceFile)) - using (bffGenerator.Declare("fastBuildProjectDependencies", UtilityMethods.FBuildFormatList(fastBuildProjectDependencies, 30))) - using (bffGenerator.Declare("fastBuildBuildOnlyDependencies", UtilityMethods.FBuildFormatList(fastBuildBuildOnlyDependencies, 30))) - using (bffGenerator.Declare("fastBuildPreBuildTargets", UtilityMethods.FBuildFormatList(fastBuildPreBuildDependencies.ToList(), 28))) + using (bffGenerator.Declare("fastBuildProjectDependencies", UtilityMethods.FBuildFormatList(fastBuildProjectDependencies.Values, 30))) + using (bffGenerator.Declare("fastBuildBuildOnlyDependencies", UtilityMethods.FBuildFormatList(fastBuildBuildOnlyDependencies.Values, 30))) + using (bffGenerator.Declare("fastBuildPreBuildTargets", UtilityMethods.FBuildFormatList(fastBuildPreBuildDependencies.Values, 28))) using (bffGenerator.Declare("fastBuildObjectListEmbeddedResources", fastBuildObjectListEmbeddedResources)) using (bffGenerator.Declare("fastBuildCompilerPCHOptions", fastBuildCompilerPCHOptions)) using (bffGenerator.Declare("fastBuildCompilerPCHOptionsClang", fastBuildCompilerPCHOptionsClang)) @@ -1298,9 +1298,9 @@ List skipFiles if (isLastSubConfig) { string genLibName = "'" + fastBuildOutputFileShortName + "_" + outputType + "'"; - using (bffGenerator.Declare("fastBuildTargetSubTargets", mustGenerateLibrary ? genLibName : UtilityMethods.FBuildFormatList(fastBuildTargetSubTargets, 15))) + using (bffGenerator.Declare("fastBuildTargetSubTargets", mustGenerateLibrary ? genLibName : UtilityMethods.FBuildFormatList(fastBuildTargetSubTargets.Values, 15))) using (bffGenerator.Declare("fastBuildOutputFileShortName", fastBuildOutputFileShortName)) - using (bffGenerator.Declare("fastBuildTargetLibraryDependencies", mustGenerateLibrary ? genLibName : UtilityMethods.FBuildFormatList(fastBuildTargetLibraryDependencies, 15))) + using (bffGenerator.Declare("fastBuildTargetLibraryDependencies", mustGenerateLibrary ? genLibName : UtilityMethods.FBuildFormatList(fastBuildTargetLibraryDependencies.Values, 15))) { bffGenerator.Write(Template.ConfigurationFile.TargetSection); bffGenerator.Write(Template.ConfigurationFile.TargetForLibraryDependencySection); @@ -1313,8 +1313,8 @@ List skipFiles { // Write Target Alias using (bffGenerator.Declare("fastBuildOutputFileShortName", fastBuildOutputFileShortName)) - using (bffGenerator.Declare("fastBuildTargetSubTargets", UtilityMethods.FBuildFormatList(fastBuildTargetSubTargets, 15))) - using (bffGenerator.Declare("fastBuildTargetLibraryDependencies", UtilityMethods.FBuildFormatList(fastBuildTargetLibraryDependencies, 15))) + using (bffGenerator.Declare("fastBuildTargetSubTargets", UtilityMethods.FBuildFormatList(fastBuildTargetSubTargets.Values, 15))) + using (bffGenerator.Declare("fastBuildTargetLibraryDependencies", UtilityMethods.FBuildFormatList(fastBuildTargetLibraryDependencies.Values, 15))) { bffGenerator.Write(Template.ConfigurationFile.TargetSection); if (!project.IsFastBuildAll) From bd4828936514a9cfda2f25cbeb9a5311579dfc61 Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Mon, 30 Aug 2021 11:38:50 +0200 Subject: [PATCH 03/15] Update FastBuild references following recent changes. --- ...citlyorderedpostbuildtest_vs2019_win64.bff | 112 ++-------- ...fastbuildfunctionaltest-globalsettings.bff | 8 +- .../projects/mixcppandcexe_vs2019_win64.bff | 208 ++---------------- .../postbuildcopydirtest_vs2019_win64.bff | 112 ++-------- ...stbuildcopysinglefiletest_vs2019_win64.bff | 112 ++-------- .../postbuildexecutetest_vs2019_win64.bff | 112 ++-------- .../postbuildtestexecution_vs2019_win64.bff | 112 ++-------- .../requireprebuildstep_vs2019_win64.bff | 112 ++-------- ...plesrcdirsfbnoblobexclude_vs2019_win64.bff | 56 +---- ...plesrcdirsfbnoblobinclude_vs2019_win64.bff | 56 +---- ...iplesrcdirsfbunityexclude_vs2019_win64.bff | 56 +---- ...iplesrcdirsfbunityinclude_vs2019_win64.bff | 56 +---- .../projects/useprecompexe_vs2019_win64.bff | 208 ++---------------- ...uildsample_vs2019_win64-globalsettings.bff | 8 +- ...fastbuildsimpleexecutable_vs2019_win64.bff | 56 +---- 15 files changed, 192 insertions(+), 1192 deletions(-) diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff index 734f9c779..663d1af3a 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff @@ -26,10 +26,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_ .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -38,45 +36,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_ + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -109,8 +89,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_ // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -220,10 +200,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6 .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -232,45 +210,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6 + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -304,8 +264,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6 // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -415,10 +375,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -427,45 +385,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -498,8 +438,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executa // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -609,10 +549,8 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objec .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -621,45 +559,27 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objec + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\explicitlyorderedpostbuildtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -693,8 +613,8 @@ Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Execu // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff index b3dc1c87a..18ac54a2e 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff @@ -27,7 +27,7 @@ Settings //================================================================================================================= Compiler( 'Compiler-x64-vs2019' ) { - .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\HostX64\x64' + .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64' .Executable = '$ExecutableRootPath$\cl.exe' .ExtraFiles = { '$ExecutableRootPath$\1033\clui.dll', @@ -100,8 +100,8 @@ Compiler( 'RC.win64Config' ) .win64Config = [ - .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64' - .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64' + .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64' + .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64' .ResourceCompiler = 'RC.win64Config' .Compiler = 'Compiler-x64-vs2019' .Librarian = '$LinkerPath$\lib.exe' @@ -110,7 +110,7 @@ Compiler( 'RC.win64Config' ) Compiler( 'ML.win64ConfigMasm' ) { - .Executable = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64\ml64.exe' + .Executable = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\ml64.exe' .CompilerFamily = 'custom' } diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff index ad2eda9e2..2d8c3313c 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff @@ -26,10 +26,8 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -38,45 +36,27 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TC' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -102,10 +82,8 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -114,45 +92,27 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -188,8 +148,8 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -262,10 +222,8 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -274,45 +232,27 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TC' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -339,10 +279,8 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -351,45 +289,27 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -426,8 +346,8 @@ Executable( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -500,10 +420,8 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -512,45 +430,27 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TC' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -576,10 +476,8 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -588,45 +486,27 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -662,8 +542,8 @@ Executable( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -736,10 +616,8 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -748,45 +626,27 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TC' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -813,10 +673,8 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -825,45 +683,27 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\mixcppandcexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -900,8 +740,8 @@ Executable( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff index 249083e44..d587e64ed 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2019_win64.bff @@ -26,10 +26,8 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -38,45 +36,27 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -109,8 +89,8 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -196,10 +176,8 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_objects' .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -208,45 +186,27 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_objects' + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -280,8 +240,8 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2019_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -367,10 +327,8 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -379,45 +337,27 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -450,8 +390,8 @@ Executable( 'PostBuildCopyDirTest_Debug_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -537,10 +477,8 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopydirtest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -549,45 +487,27 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopydirtest\postbuildcopydirtest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -621,8 +541,8 @@ Executable( 'PostBuildCopyDirTest_Release_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff index 44673bd44..2d2604023 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2019_win64.bff @@ -26,10 +26,8 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_obj .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -38,45 +36,27 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_obj + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -109,8 +89,8 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2019_win64_Exe // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -195,10 +175,8 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_o .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -207,45 +185,27 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_o + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -279,8 +239,8 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2019_win64_E // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -365,10 +325,8 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -377,45 +335,27 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -448,8 +388,8 @@ Executable( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2019_win64_Executable // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -534,10 +474,8 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_objects' .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopysinglefiletest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -546,45 +484,27 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_objects' + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildcopysinglefiletest\postbuildcopysinglefiletest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -618,8 +538,8 @@ Executable( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2019_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.bff index 692cfecae..46e14548a 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2019_win64.bff @@ -26,10 +26,8 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -38,45 +36,27 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -109,8 +89,8 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -196,10 +176,8 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_objects' .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -208,45 +186,27 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_objects' + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -280,8 +240,8 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2019_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -367,10 +327,8 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -379,45 +337,27 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -450,8 +390,8 @@ Executable( 'PostBuildExecuteTest_Debug_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -537,10 +477,8 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildexecutetest\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -549,45 +487,27 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildexecutetest\postbuildexecutetest_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -621,8 +541,8 @@ Executable( 'PostBuildExecuteTest_Release_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.bff index 5922b25c3..60c1f5cbe 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2019_win64.bff @@ -26,10 +26,8 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_objects' .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -38,45 +36,27 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_objects' + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -109,8 +89,8 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2019_win64_Executab // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -196,10 +176,8 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_object .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -208,45 +186,27 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_object + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -280,8 +240,8 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2019_win64_Execut // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -367,10 +327,8 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -379,45 +337,27 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -450,8 +390,8 @@ Executable( 'PostBuildTestExecution_Debug_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -537,10 +477,8 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildtestexecution\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -549,45 +487,27 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\postbuildtestexecution\postbuildtestexecution_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -621,8 +541,8 @@ Executable( 'PostBuildTestExecution_Release_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.bff index 65eacded3..3907fb4f8 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2019_win64.bff @@ -26,11 +26,9 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -39,45 +37,27 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -112,8 +92,8 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2019_win64_Executable' // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -186,11 +166,9 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64_objects' .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -199,45 +177,27 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64_objects' + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -273,8 +233,8 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2019_win64_Executabl // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -347,11 +307,9 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -360,45 +318,27 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -433,8 +373,8 @@ Executable( 'RequirePreBuildStep_Debug_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -507,11 +447,9 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\requireprebuildstep\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\generated"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -520,45 +458,27 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\requireprebuildstep\requireprebuildstep_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -594,8 +514,8 @@ Executable( 'RequirePreBuildStep_Release_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff index eb5d93200..54bb083f6 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff @@ -16,12 +16,10 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_wi .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -30,45 +28,27 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_wi + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -112,8 +92,8 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Debug_FastBuild_NoBlob_vs2019_wi // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -186,12 +166,10 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_ .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -200,45 +178,27 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_ + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobexclude\spanmultiplesrcdirsfbnoblobexclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -283,8 +243,8 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobExclude_Release_FastBuild_NoBlob_vs2019_ // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff index 9b85c259f..7e1dab993 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff @@ -16,12 +16,10 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_wi .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -30,45 +28,27 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_wi + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -109,8 +89,8 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Debug_FastBuild_NoBlob_vs2019_wi // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -183,12 +163,10 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_ .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -197,45 +175,27 @@ ObjectList( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_ + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\spanmultiplesrcdirsfbnoblobinclude\spanmultiplesrcdirsfbnoblobinclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -277,8 +237,8 @@ Executable( 'SpanMultipleSrcDirsFBNoBlobInclude_Release_FastBuild_NoBlob_vs2019_ // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff index 5bcec0754..6091a85fb 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff @@ -33,12 +33,10 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64_obje .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -47,45 +45,27 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64_obje + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -118,8 +98,8 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Debug_FastBuild_vs2019_win64_Exec // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -192,12 +172,10 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64_ob .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -206,45 +184,27 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64_ob + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityexclude\spanmultiplesrcdirsfbunityexclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -278,8 +238,8 @@ Executable( 'SpanMultipleSrcDirsFBUnityExclude_Release_FastBuild_vs2019_win64_Ex // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff index 2d5e274b0..d4ec3129b 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff @@ -34,12 +34,10 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64_obje .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -48,45 +46,27 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64_obje + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -119,8 +99,8 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Debug_FastBuild_vs2019_win64_Exec // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -193,12 +173,10 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64_ob .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\' .CompilerExtraOptions = '' - // General options - // --------------------------- + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\additional_dir"' + ' /I".\$_CURRENT_BFF_DIR_$\..\codebase\spanmultiplesrcdirs\dir_individual_files"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -207,45 +185,27 @@ ObjectList( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64_ob + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\spanmultiplesrcdirsfbunityinclude\spanmultiplesrcdirsfbunityinclude_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -279,8 +239,8 @@ Executable( 'SpanMultipleSrcDirsFBUnityInclude_Release_FastBuild_vs2019_win64_Ex // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.bff b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.bff index 907c1dacd..13c90fdc8 100644 --- a/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.bff +++ b/Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/useprecompexe_vs2019_win64.bff @@ -28,10 +28,8 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -40,46 +38,28 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -120,10 +100,8 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -132,46 +110,28 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -210,8 +170,8 @@ Executable( 'UsePrecompExe_Debug_FastBuild_NoBlob_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -284,10 +244,8 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -296,46 +254,28 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -377,10 +317,8 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -389,46 +327,28 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -468,8 +388,8 @@ Executable( 'UsePrecompExe_Release_FastBuild_NoBlob_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -542,10 +462,8 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -554,46 +472,28 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -631,10 +531,8 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -643,46 +541,28 @@ ObjectList( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -721,8 +601,8 @@ Executable( 'UsePrecompExe_Debug_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -795,10 +675,8 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2019_win64_0_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -807,46 +685,28 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2019_win64_0_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -885,10 +745,8 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2019_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -897,46 +755,28 @@ ObjectList( 'UsePrecompExe_Release_FastBuild_vs2019_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"SOME_UTILITY_STRING=\"UTIL FUNC\""' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\useprecompexe\useprecompexe_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /FS /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -976,8 +816,8 @@ Executable( 'UsePrecompExe_Release_FastBuild_vs2019_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input diff --git a/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsample_vs2019_win64-globalsettings.bff b/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsample_vs2019_win64-globalsettings.bff index b3dc1c87a..18ac54a2e 100644 --- a/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsample_vs2019_win64-globalsettings.bff +++ b/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsample_vs2019_win64-globalsettings.bff @@ -27,7 +27,7 @@ Settings //================================================================================================================= Compiler( 'Compiler-x64-vs2019' ) { - .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\HostX64\x64' + .ExecutableRootPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64' .Executable = '$ExecutableRootPath$\cl.exe' .ExtraFiles = { '$ExecutableRootPath$\1033\clui.dll', @@ -100,8 +100,8 @@ Compiler( 'RC.win64Config' ) .win64Config = [ - .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64' - .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64' + .BinPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64' + .LinkerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64' .ResourceCompiler = 'RC.win64Config' .Compiler = 'Compiler-x64-vs2019' .Librarian = '$LinkerPath$\lib.exe' @@ -110,7 +110,7 @@ Compiler( 'RC.win64Config' ) Compiler( 'ML.win64ConfigMasm' ) { - .Executable = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64\ml64.exe' + .Executable = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\ml64.exe' .CompilerFamily = 'custom' } diff --git a/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2019_win64.bff b/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2019_win64.bff index f8f1e7434..c448a9d61 100644 --- a/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2019_win64.bff +++ b/samples/FastBuildSimpleExecutable/reference/projects/fastbuildsimpleexecutable_vs2019_win64.bff @@ -16,10 +16,8 @@ ObjectList( 'FastBuildSimpleExecutable_Debug_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\debug\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -28,45 +26,27 @@ ObjectList( 'FastBuildSimpleExecutable_Debug_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"WIN64"' + ' /D"_CONSOLE"' + ' /D"_DEBUG"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MTd' + ' /GS' + ' /Gy-' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\obj\win64\debug\fastbuildsimpleexecutable_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Od' + ' /Ob1' @@ -99,8 +79,8 @@ Executable( 'FastBuildSimpleExecutable_Debug_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input @@ -173,10 +153,8 @@ ObjectList( 'FastBuildSimpleExecutable_Release_win64_objects' ) .Intermediate = '.\$_CURRENT_BFF_DIR_$\obj\win64\release\' .CompilerExtraOptions = '' - // General options - // --------------------------- - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\include"' - + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\include"' + + ' /I"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\include"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared"' + ' /I"C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\winrt"' @@ -185,45 +163,27 @@ ObjectList( 'FastBuildSimpleExecutable_Release_win64_objects' ) + ' /nologo' + ' /W4' + ' /WX-' - // Multi-threaded build is already handled by FASTBuild - // + ' /MP' - // Preprocessor options - // --------------------------- + ' /D"NDEBUG"' + ' /D"WIN64"' + ' /D"_CONSOLE"' - // Code Generation options - // --------------------------- + ' /GF' + ' /MT' + ' /GS-' + ' /Gy' + ' /fp:fast' + ' /fp:except-' - // Language options - // --------------------------- + ' /Zc:wchar_t' + ' /Zc:forScope' + ' /Zc:inline' + ' /GR-' + ' /openmp-' - // Output Files options - // --------------------------- + ' /Fd".\$_CURRENT_BFF_DIR_$\obj\win64\release\fastbuildsimpleexecutable_compiler.pdb"' - // Advanced options - // --------------------------- + ' /Gd' + ' /TP' + ' /errorReport:queue' - // Character Set - // --------------------------- + ' /D"_MBCS"' - // Additional compiler options - //-------------------------- + ' /Zc:__cplusplus' - // Optimizations options - // --------------------- .CompilerOptimizations = '' + ' /Ox' + ' /Ob2' @@ -257,8 +217,8 @@ Executable( 'FastBuildSimpleExecutable_Release_win64_Executable' ) // --------------------------- + ' /INCREMENTAL:NO' + ' /NOLOGO' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\lib\x64"' - + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\atlmfc\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\lib\x64"' + + ' /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\atlmfc\lib\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\ucrt\x64"' + ' /LIBPATH:"C:\Program Files (x86)\Windows Kits\10\Lib\10.0.19041.0\um\x64"' // Input From 87c5004d8b81c13adfd95a01bea2ed9eb8d62d30 Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Mon, 30 Aug 2021 19:22:03 +0200 Subject: [PATCH 04/15] Log the name of the FastBuild project that's being added to the solution --- Sharpmake/Solution.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sharpmake/Solution.cs b/Sharpmake/Solution.cs index cfb2a2400..b600844d9 100644 --- a/Sharpmake/Solution.cs +++ b/Sharpmake/Solution.cs @@ -547,7 +547,7 @@ private void MakeFastBuildAllProjectIfNeeded(Builder builder, Dictionary Date: Mon, 30 Aug 2021 19:22:47 +0200 Subject: [PATCH 05/15] [Bff] Prevent adding projects that we can't build or don't output anything to the FastBuildAll project alias --- Sharpmake.Generators/FastBuild/Bff.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Sharpmake.Generators/FastBuild/Bff.cs b/Sharpmake.Generators/FastBuild/Bff.cs index 4ed0954f2..2e2d3f3fb 100644 --- a/Sharpmake.Generators/FastBuild/Bff.cs +++ b/Sharpmake.Generators/FastBuild/Bff.cs @@ -556,7 +556,14 @@ List skipFiles // filter to only get the configurations of projects that were explicitly added, not the dependencies var minResolvedConf = conf.ResolvedPrivateDependencies.Where(x => conf.UnResolvedPrivateDependencies.ContainsKey(x.Project.GetType())); foreach (var dep in minResolvedConf) - fastBuildTargetSubTargets.Add(GetShortProjectName(dep.Project, dep)); + { + if (dep.Project.SharpmakeProjectType != Project.ProjectTypeAttribute.Export && + dep.Output != Project.Configuration.OutputType.None && + dep.Output != Project.Configuration.OutputType.Utility) + { + fastBuildTargetSubTargets.Add(GetShortProjectName(dep.Project, dep)); + } + } } else { From 365c783ea0cb8d06df61abeaf910176cf07e811d Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Mon, 6 Sep 2021 10:00:59 +0200 Subject: [PATCH 06/15] Add extension .sharpmake.cs to tmp files --- Sharpmake/Assembler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sharpmake/Assembler.cs b/Sharpmake/Assembler.cs index 3823fd6f8..bc1fcdb2b 100644 --- a/Sharpmake/Assembler.cs +++ b/Sharpmake/Assembler.cs @@ -193,7 +193,7 @@ public static TDelegate BuildDelegate(string functionBody, string fun // the temp files and deleting them. // eg. "C:\\fastbuild-work\\85f7d472c25d494ca09f2ea7fe282d50" //string sourceTmpFile = Path.GetTempFileName(); - string sourceTmpFile = Path.Combine(Path.GetTempPath(), (Guid.NewGuid().ToString("N") + ".tmp")); + string sourceTmpFile = Path.Combine(Path.GetTempPath(), (Guid.NewGuid().ToString("N") + ".tmp.sharpmake.cs")); Type delegateType = typeof(TDelegate); From 2349b4490e198b86ee501b04051798a4c91c5eb5 Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Mon, 6 Sep 2021 10:04:36 +0200 Subject: [PATCH 07/15] Make the Resolve method in Project virtual, override it from the CSharpProject so we can resolve some variables as path --- Sharpmake/Project.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Sharpmake/Project.cs b/Sharpmake/Project.cs index 3f597cb8d..481645f34 100644 --- a/Sharpmake/Project.cs +++ b/Sharpmake/Project.cs @@ -1798,7 +1798,7 @@ public virtual void PostResolve() } } - internal void Resolve(Builder builder, bool skipInvalidPath) + internal virtual void Resolve(Builder builder, bool skipInvalidPath) { if (Resolved) return; @@ -2426,6 +2426,18 @@ internal CSharpProject(Type targetType, Type configurationType, bool isInternal) InitCSharpSpecifics(); } + internal override void Resolve(Builder builder, bool skipInvalidPath) + { + base.Resolve(builder, skipInvalidPath); + + if (!string.IsNullOrEmpty(ApplicationIcon)) + Util.ResolvePath(SourceRootPath, ref ApplicationIcon); + if (!string.IsNullOrEmpty(ApplicationManifest)) + Util.ResolvePath(SourceRootPath, ref ApplicationManifest); + if (!string.IsNullOrEmpty(ApplicationSplashScreen)) + Util.ResolvePath(SourceRootPath, ref ApplicationSplashScreen); + } + public void AddCSharpSpecificImportProjects(List importProjects, DevEnv devEnv) { if (ProjectTypeGuids == CSharpProjectType.Vsix) From ad2715ddc5784d6d892c48c9c78e18647d597304 Mon Sep 17 00:00:00 2001 From: Trithek <90745034+Trithek@users.noreply.github.com> Date: Wed, 15 Sep 2021 10:33:51 +0300 Subject: [PATCH 08/15] Added support for IsPublishable C# project config item (#144) * Added support for IsPublishable C# project config item --- Sharpmake.Generators/VisualStudio/Csproj.Template.cs | 1 + Sharpmake.Generators/VisualStudio/Csproj.cs | 6 ++++++ Sharpmake/Options.CSharp.cs | 11 +++++++++++ 3 files changed, 18 insertions(+) diff --git a/Sharpmake.Generators/VisualStudio/Csproj.Template.cs b/Sharpmake.Generators/VisualStudio/Csproj.Template.cs index 4198a155e..0b62b4ab2 100644 --- a/Sharpmake.Generators/VisualStudio/Csproj.Template.cs +++ b/Sharpmake.Generators/VisualStudio/Csproj.Template.cs @@ -54,6 +54,7 @@ public static class Project [options.FileAlignment] [options.IsWebBootstrapper] [projectTypeGuids] + [options.IsPublishable] [options.PublishUrl] [options.InstallUrl] [options.ManifestKeyFile] diff --git a/Sharpmake.Generators/VisualStudio/Csproj.cs b/Sharpmake.Generators/VisualStudio/Csproj.cs index 5c6e4e9be..148770faf 100644 --- a/Sharpmake.Generators/VisualStudio/Csproj.cs +++ b/Sharpmake.Generators/VisualStudio/Csproj.cs @@ -3426,6 +3426,12 @@ private Options.ExplicitOptions GenerateOptions(CSharpProject project, Project.C Options.Option(Options.CSharp.ProduceReferenceAssembly.Disabled, () => { options["ProduceReferenceAssembly"] = RemoveLineTag; }) ); + SelectOption + ( + Options.Option(Options.CSharp.IsPublishable.Enabled, () => { options["IsPublishable"] = RemoveLineTag; }), + Options.Option(Options.CSharp.IsPublishable.Disabled, () => { options["IsPublishable"] = "false"; }) + ); + options["AssemblyOriginatorKeyFile"] = Options.PathOption.Get(conf, RemoveLineTag, _projectPath); options["MinimumVisualStudioVersion"] = Options.StringOption.Get(conf); options["OldToolsVersion"] = Options.StringOption.Get(conf); diff --git a/Sharpmake/Options.CSharp.cs b/Sharpmake/Options.CSharp.cs index 07f1c5b40..0b4a4fbb7 100644 --- a/Sharpmake/Options.CSharp.cs +++ b/Sharpmake/Options.CSharp.cs @@ -546,6 +546,17 @@ public enum SonarQubeExclude Disabled, Enabled } + + /// + /// Controls whether the project is published when running a publish command + /// Only affects processes that use the Publish target, such as the dotnet sdk projects + public enum IsPublishable + /// + { + Disabled, + [Default] + Enabled + } } } } From b748886ce0711866500fe9525ac907f08f3316fb Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Wed, 15 Sep 2021 09:50:40 +0200 Subject: [PATCH 09/15] Fix xmldoc comment placed on the wrong line --- Sharpmake/Options.CSharp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sharpmake/Options.CSharp.cs b/Sharpmake/Options.CSharp.cs index 0b4a4fbb7..5347817fd 100644 --- a/Sharpmake/Options.CSharp.cs +++ b/Sharpmake/Options.CSharp.cs @@ -550,8 +550,8 @@ public enum SonarQubeExclude /// /// Controls whether the project is published when running a publish command /// Only affects processes that use the Publish target, such as the dotnet sdk projects - public enum IsPublishable /// + public enum IsPublishable { Disabled, [Default] From 2730648363bd4fb1ff50b8779175c81a8b1d0982 Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Tue, 7 Sep 2021 11:00:59 +0200 Subject: [PATCH 10/15] Rename internal method to better match what it does --- Sharpmake/Builder.cs | 4 ++-- Sharpmake/Solution.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sharpmake/Builder.cs b/Sharpmake/Builder.cs index 40ec61e3d..38ee50cfb 100644 --- a/Sharpmake/Builder.cs +++ b/Sharpmake/Builder.cs @@ -682,8 +682,8 @@ public Solution LoadSolutionType(Type type) !type.IsDefined(typeof(Export), false)) throw new Error("cannot generate solution type without [Sharpmake.Generate], [Sharpmake.Compile] or [Sharpmake.Export] attribute: {0}", type.Name); - // Create the project instance - Solution solution = Solution.CreateProject(type, Arguments.FragmentMasks); + // Create the solution instance + Solution solution = Solution.CreateSolution(type, Arguments.FragmentMasks); // Pre event EventPreSolutionConfigure?.Invoke(solution); diff --git a/Sharpmake/Solution.cs b/Sharpmake/Solution.cs index b600844d9..2847661f1 100644 --- a/Sharpmake/Solution.cs +++ b/Sharpmake/Solution.cs @@ -146,7 +146,7 @@ public int GetHashCode(ResolvedProject obj) } } - internal static Solution CreateProject(Type solutionType, List fragmentMasks) + internal static Solution CreateSolution(Type solutionType, List fragmentMasks) { Solution solution; try From ab87c9a569f1a2aa85734c1c76c776896924aaa4 Mon Sep 17 00:00:00 2001 From: Rudy Pons Date: Thu, 23 Sep 2021 17:04:02 +0200 Subject: [PATCH 11/15] Add NMakeForcedIncludes support to MakeFile/FastBuild projects for better Intellisense support --- .../Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs index e96a87e26..7049f78f6 100644 --- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs +++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/BasePlatform.Vcxproj.Template.cs @@ -275,6 +275,7 @@ public abstract partial class BasePlatform [options.OutputFile] [options.PreprocessorDefinitions] [options.AdditionalIncludeDirectories] + [options.ForcedIncludeFiles] "; @@ -288,6 +289,7 @@ public abstract partial class BasePlatform [conf.CustomBuildSettings.OutputFile] [options.PreprocessorDefinitions] [options.AdditionalIncludeDirectories] + [options.ForcedIncludeFiles] "; } From e70b4cd09a1fcf44b0353918d4a11cfc03ed8fad Mon Sep 17 00:00:00 2001 From: Rudy Pons Date: Thu, 23 Sep 2021 17:23:08 +0200 Subject: [PATCH 12/15] Add CLanguageStandard/CppLanguageStandard to Linux MakeFile vcxproj for better Intellisense support --- .../VisualStudio/ProjectOptionsGenerator.cs | 44 +++++++++---------- .../Linux/LinuxPlatform.Vcxproj.Template.cs | 6 +++ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs b/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs index 04c2ab78c..82b74b202 100644 --- a/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs +++ b/Sharpmake.Generators/VisualStudio/ProjectOptionsGenerator.cs @@ -297,32 +297,32 @@ private void GenerateCompilerOptions(IGenerationContext context, ProjectOptionsG //https://clang.llvm.org/docs/CommandGuide/clang.html context.SelectOption ( - Options.Option(Options.Clang.Compiler.CppLanguageStandard.Default, () => { context.Options["ClangCppLanguageStandard"] = FileGeneratorUtilities.RemoveLineTag; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp98, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++98"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp11, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++11"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp14, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++14"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp17, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++17"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp2a, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++2a"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp98, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++98"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp11, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++11"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp14, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++14"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp17, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++17"; }), - Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp2a, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++2a"; }) + Options.Option(Options.Clang.Compiler.CppLanguageStandard.Default, () => { context.Options["ClangCppLanguageStandard"] = FileGeneratorUtilities.RemoveLineTag; context.Options["CppLanguageStandard"] = FileGeneratorUtilities.RemoveLineTag; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp98, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++98"; context.Options["CppLanguageStandard"] = "c++98"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp11, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++11"; context.Options["CppLanguageStandard"] = "c++11"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp14, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++14"; context.Options["CppLanguageStandard"] = "c++14"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp17, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++17"; context.Options["CppLanguageStandard"] = "c++17"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.Cpp2a, () => { context.Options["ClangCppLanguageStandard"] = "-std=c++2a"; context.Options["CppLanguageStandard"] = "c++2a"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp98, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++98"; context.Options["CppLanguageStandard"] = "gnu++98"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp11, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++11"; context.Options["CppLanguageStandard"] = "gnu++11"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp14, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++14"; context.Options["CppLanguageStandard"] = "gnu++14"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp17, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++17"; context.Options["CppLanguageStandard"] = "gnu++17"; }), + Options.Option(Options.Clang.Compiler.CppLanguageStandard.GnuCpp2a, () => { context.Options["ClangCppLanguageStandard"] = "-std=gnu++2a"; context.Options["CppLanguageStandard"] = "gnu++2a"; }) ); context.SelectOption ( - Options.Option(Options.Clang.Compiler.CLanguageStandard.Default, () => { context.Options["ClangCLanguageStandard"] = FileGeneratorUtilities.RemoveLineTag; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.C89, () => { context.Options["ClangCLanguageStandard"] = "-std=c89"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.C90, () => { context.Options["ClangCLanguageStandard"] = "-std=c90"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.C99, () => { context.Options["ClangCLanguageStandard"] = "-std=c99"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.C11, () => { context.Options["ClangCLanguageStandard"] = "-std=c11"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.C17, () => { context.Options["ClangCLanguageStandard"] = "-std=c17"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC89, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu89"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC90, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu90"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC99, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu99"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC11, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu11"; }), - Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC17, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu17"; }) + Options.Option(Options.Clang.Compiler.CLanguageStandard.Default, () => { context.Options["ClangCLanguageStandard"] = FileGeneratorUtilities.RemoveLineTag; context.Options["CLanguageStandard"] = FileGeneratorUtilities.RemoveLineTag; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.C89, () => { context.Options["ClangCLanguageStandard"] = "-std=c89"; context.Options["CLanguageStandard"] = "c89"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.C90, () => { context.Options["ClangCLanguageStandard"] = "-std=c90"; context.Options["CLanguageStandard"] = "c90"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.C99, () => { context.Options["ClangCLanguageStandard"] = "-std=c99"; context.Options["CLanguageStandard"] = "c99"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.C11, () => { context.Options["ClangCLanguageStandard"] = "-std=c11"; context.Options["CLanguageStandard"] = "c11"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.C17, () => { context.Options["ClangCLanguageStandard"] = "-std=c17"; context.Options["CLanguageStandard"] = "c17"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC89, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu89"; context.Options["CLanguageStandard"] = "gnu89"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC90, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu90"; context.Options["CLanguageStandard"] = "gnu90"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC99, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu99"; context.Options["CLanguageStandard"] = "gnu99"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC11, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu11"; context.Options["CLanguageStandard"] = "gnu11"; }), + Options.Option(Options.Clang.Compiler.CLanguageStandard.GnuC17, () => { context.Options["ClangCLanguageStandard"] = "-std=gnu17"; context.Options["CLanguageStandard"] = "gnu17"; }) ); context.CommandLineOptions["CppLanguageStd"] = context.Options["ClangCppLanguageStandard"]; diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs index f18eb420e..7f570bf38 100644 --- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs +++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs @@ -146,6 +146,12 @@ public sealed partial class LinuxPlatform del ""$(ProjectDir)[options.OutputDirectory]\[conf.TargetFileFullName].pdb"" >NUL 2>NUL del ""$(ProjectDir)[options.OutputDirectory]\[conf.TargetFileFullName]"" >NUL 2>NUL + + +[options.CLanguageStandard] +[options.CppLanguageStandard] + + "; private const string _projectDescriptionPlatformSpecific = From e59c1c1c88691bb31c8900989e1e5c087477b52e Mon Sep 17 00:00:00 2001 From: Rudy Pons Date: Thu, 23 Sep 2021 17:26:29 +0200 Subject: [PATCH 13/15] Add system includes from ILinuxSystemPathProvider to NMakeIncludeSearchPath for correct Intellisense support --- Sharpmake.Generators/VisualStudio/Vcxproj.cs | 3 +++ .../Linux/LinuxPlatform.Vcxproj.Template.cs | 1 + 2 files changed, 4 insertions(+) diff --git a/Sharpmake.Generators/VisualStudio/Vcxproj.cs b/Sharpmake.Generators/VisualStudio/Vcxproj.cs index 10e333e30..6d64d71b4 100644 --- a/Sharpmake.Generators/VisualStudio/Vcxproj.cs +++ b/Sharpmake.Generators/VisualStudio/Vcxproj.cs @@ -729,6 +729,9 @@ private static void FillIncludeDirectoriesOptions(GenerationContext context) var includePaths = platformVcxproj.GetIncludePaths(context); context.Options["AdditionalIncludeDirectories"] = includePaths.Any() ? Util.PathGetRelative(context.ProjectDirectory, includePaths).JoinStrings(";") : FileGeneratorUtilities.RemoveLineTag; + var platformIncludePaths = platformVcxproj.GetPlatformIncludePaths(context); + context.Options["AdditionalPlatformIncludeDirectories"] = platformIncludePaths.Any() ? Util.PathGetRelative(context.ProjectDirectory, platformIncludePaths).JoinStrings(";") : FileGeneratorUtilities.RemoveLineTag; + // Fill resource include dirs var resourceIncludePaths = platformVcxproj.GetResourceIncludePaths(context); context.Options["AdditionalResourceIncludeDirectories"] = resourceIncludePaths.Any() ? Util.PathGetRelative(context.ProjectDirectory, resourceIncludePaths).JoinStrings(";") : FileGeneratorUtilities.RemoveLineTag; diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs index 7f570bf38..c2f4e1b3e 100644 --- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs +++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Linux/LinuxPlatform.Vcxproj.Template.cs @@ -145,6 +145,7 @@ public sealed partial class LinuxPlatform del ""$(ProjectDir)[options.OutputDirectory]\[conf.TargetFileFullName].lib"" >NUL 2>NUL del ""$(ProjectDir)[options.OutputDirectory]\[conf.TargetFileFullName].pdb"" >NUL 2>NUL del ""$(ProjectDir)[options.OutputDirectory]\[conf.TargetFileFullName]"" >NUL 2>NUL +$(NMakeIncludeSearchPath);[options.AdditionalPlatformIncludeDirectories] From 5c8a3d2f9b4930af37c9536a63a0f33d151bec5b Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Mon, 27 Sep 2021 11:34:15 +0200 Subject: [PATCH 14/15] Fix concurrency issue in ReportGenerated that could lead to a "key already existed in the dictionary" exception Instead of using our GetValueOrAdd extension, use the GetOrAdd that's provided by the ConcurrentDictionary --- Sharpmake/Builder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sharpmake/Builder.cs b/Sharpmake/Builder.cs index 38ee50cfb..44120299a 100644 --- a/Sharpmake/Builder.cs +++ b/Sharpmake/Builder.cs @@ -831,7 +831,7 @@ private void WriteLogs() public void ReportGenerated(Type t, GenerationOutput output) { - var generationOutput = _generationReport.GetValueOrAdd(t, new GenerationOutput()); + var generationOutput = _generationReport.GetOrAdd(t, new GenerationOutput()); generationOutput.Merge(output); } From 5532db0a29672bc727ab62e6f4b929d7ee19cfff Mon Sep 17 00:00:00 2001 From: Lambert Clara Date: Tue, 28 Sep 2021 10:00:19 +0200 Subject: [PATCH 15/15] Bump version number to 0.17.3 --- Sharpmake.Application/Properties/AssemblyInfo.cs | 2 +- Sharpmake.Generators/Properties/AssemblyInfo.cs | 2 +- .../Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs | 2 +- Sharpmake/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs index b807523b4..d88bb638a 100644 --- a/Sharpmake.Application/Properties/AssemblyInfo.cs +++ b/Sharpmake.Application/Properties/AssemblyInfo.cs @@ -43,4 +43,4 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.*")] +[assembly: AssemblyVersion("0.17.3.0")] diff --git a/Sharpmake.Generators/Properties/AssemblyInfo.cs b/Sharpmake.Generators/Properties/AssemblyInfo.cs index 5d80d2099..95224fec5 100644 --- a/Sharpmake.Generators/Properties/AssemblyInfo.cs +++ b/Sharpmake.Generators/Properties/AssemblyInfo.cs @@ -44,6 +44,6 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.*")] +[assembly: AssemblyVersion("0.17.3.0")] [assembly: InternalsVisibleTo("Sharpmake")] diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs index 92bbe8a45..e1a8544da 100644 --- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs +++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs @@ -44,6 +44,6 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.*")] +[assembly: AssemblyVersion("0.17.3.0")] [assembly: SharpmakeExtension] diff --git a/Sharpmake/Properties/AssemblyInfo.cs b/Sharpmake/Properties/AssemblyInfo.cs index 566906cd4..00d71b015 100644 --- a/Sharpmake/Properties/AssemblyInfo.cs +++ b/Sharpmake/Properties/AssemblyInfo.cs @@ -44,9 +44,9 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.17.2.*")] +[assembly: AssemblyVersion("0.17.3.0")] #pragma warning disable CS7035 -[assembly: AssemblyFileVersion("0.17.2.* (LocalBuild)")] +[assembly: AssemblyFileVersion("0.17.3.0 (LocalBuild)")] #pragma warning restore [assembly: InternalsVisibleTo("Sharpmake.Application")]