Eliminate all dynamic require statements (#2230)

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/compilers/wine-vc.js b/lib/compilers/wine-vc.js
index 8c831e840..16cb02a63 100644
--- a/lib/compilers/wine-vc.js
+++ b/lib/compilers/wine-vc.js
@@ -26,9 +26,12 @@ const BaseCompiler = require('../base-compiler'),
     AsmParser = require('../asm-parser-vc'),
     argumentParsers = require('./argument-parsers'),
     path = require('path'),
-    PELabelReconstructor = require('../pe32-support').labelReconstructor;
+    PELabelReconstructor = require('../pe32-support').labelReconstructor,
+    MapFileReaderVS = require('../map-file-vs').MapFileReader;
 
 class WineVcCompiler extends BaseCompiler {
+    static get key() { return 'wine-vc'; }
+
     constructor(info, env) {
         info.supportsFiltersInBinary = true;
         super(info, env);
@@ -80,9 +83,10 @@ class WineVcCompiler extends BaseCompiler {
     optionsForFilter(filters, outputFilename) {
         if (filters.binary) {
             const mapFilename = outputFilename + '.map';
+            const mapFileReader = new MapFileReaderVS(mapFilename);
 
             filters.preProcessBinaryAsmLines = (asmLines) => {
-                const reconstructor = new PELabelReconstructor(asmLines, mapFilename, false, 'vs');
+                const reconstructor = new PELabelReconstructor(asmLines, false, mapFileReader);
                 reconstructor.run('output.s.obj');
 
                 return reconstructor.asmLines;