2 files changed, 4 insertions, 5 deletions
diff --git a/source/core/windows/slang-win-visual-studio-util.cpp b/source/core/windows/slang-win-visual-studio-util.cpp
index 81d77c710..7e683ee55 100644
--- a/source/core/windows/slang-win-visual-studio-util.cpp
+++ b/source/core/windows/slang-win-visual-studio-util.cpp
@@ -4,6 +4,8 @@
 #include "../slang-process-util.h"
 #include "../slang-string-util.h"
 
+#include "../slang-visual-studio-compiler-util.h"
+
 #ifdef _WIN32
 #   define WIN32_LEAN_AND_MEAN
 #   define NOMINMAX
@@ -291,7 +293,7 @@ static SlangResult _find(int versionIndex, WinVisualStudioUtil::VersionPath& out
             CommandLine cmdLine;
             calcExecuteCompilerArgs(versionPath, cmdLine);
             
-            RefPtr<GenericCPPCompiler> compiler = new GenericCPPCompiler(desc, cmdLine, &CPPCompilerUtil::calcVisualStudioArgs);
+            RefPtr<GenericCPPCompiler> compiler = new GenericCPPCompiler(desc, cmdLine, &VisualStudioCompilerUtil::calcArgs, &VisualStudioCompilerUtil::parseOutput);
             set->addCompiler(compiler);
         }
     }
diff --git a/source/core/windows/slang-win-visual-studio-util.h b/source/core/windows/slang-win-visual-studio-util.h
index 76e1cc710..34be8473d 100644
--- a/source/core/windows/slang-win-visual-studio-util.h
+++ b/source/core/windows/slang-win-visual-studio-util.h
@@ -51,14 +51,11 @@ struct WinVisualStudioUtil
         /// Convert a version number into a string
     static void append(Version version, StringBuilder& outBuilder);
 
-        /// Calculate the command line args
-    static void calcArgs(const CPPCompiler::CompileOptions& options, CommandLine& cmdLine);
-
         /// Get version as desc
     static CPPCompiler::Desc getDesc(Version version)
     {
         CPPCompiler::Desc desc;
-        desc.type = CPPCompiler::Type::VisualStudio;
+        desc.type = CPPCompiler::CompilerType::VisualStudio;
         desc.majorVersion = Int(version) / 10;
         desc.minorVersion = Int(version) % 10;
         return desc;