diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2019-02-11 22:25:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 22:25:11 +0100 |
| commit | 9115c6ab15c7751a13383a5be847205057ea9f1c (patch) | |
| tree | 5da9f9189caa6a84a69af13cd086fcf1a375d9df /modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs | |
| parent | fa7329f6485058fde30b8e2bfe26291dfbfc4434 (diff) | |
| parent | da00c338a37037447d6806a301ae89201ee574a7 (diff) | |
| download | redot-engine-9115c6ab15c7751a13383a5be847205057ea9f1c.tar.gz | |
Merge pull request #25803 from neikeq/yy
Windows: Default to system MSBuild and add VSCode hint path
Diffstat (limited to 'modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs')
| -rw-r--r-- | modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs b/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs index 4137f5eaef..e7d0486c76 100644 --- a/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs +++ b/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs @@ -18,8 +18,6 @@ namespace GodotSharpTools.Build [MethodImpl(MethodImplOptions.InternalCall)] private extern static string godot_icall_BuildInstance_get_MSBuildPath(); [MethodImpl(MethodImplOptions.InternalCall)] - private extern static string godot_icall_BuildInstance_get_FrameworkPath(); - [MethodImpl(MethodImplOptions.InternalCall)] private extern static string godot_icall_BuildInstance_get_MonoWindowsBinDir(); [MethodImpl(MethodImplOptions.InternalCall)] private extern static bool godot_icall_BuildInstance_get_UsingMonoMSBuildOnWindows(); @@ -34,11 +32,6 @@ namespace GodotSharpTools.Build return msbuildPath; } - private static string GetFrameworkPath() - { - return godot_icall_BuildInstance_get_FrameworkPath(); - } - private static string MonoWindowsBinDir { get @@ -85,11 +78,6 @@ namespace GodotSharpTools.Build if (customProperties != null) customPropertiesList.AddRange(customProperties); - string frameworkPath = GetFrameworkPath(); - - if (!string.IsNullOrEmpty(frameworkPath)) - customPropertiesList.Add("FrameworkPathOverride=" + frameworkPath); - string compilerArgs = BuildArguments(loggerAssemblyPath, loggerOutputDir, customPropertiesList); ProcessStartInfo startInfo = new ProcessStartInfo(GetMSBuildPath(), compilerArgs); @@ -145,11 +133,6 @@ namespace GodotSharpTools.Build if (customProperties != null) customPropertiesList.AddRange(customProperties); - string frameworkPath = GetFrameworkPath(); - - if (!string.IsNullOrEmpty(frameworkPath)) - customPropertiesList.Add("FrameworkPathOverride=" + frameworkPath); - string compilerArgs = BuildArguments(loggerAssemblyPath, loggerOutputDir, customPropertiesList); ProcessStartInfo startInfo = new ProcessStartInfo(GetMSBuildPath(), compilerArgs); |