fix

one-ware · Mar 28, 2024 · 3f829b4 · 3f829b4
1 parent 579de3c
commit 3f829b4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/OneWare.Ghdl/Services/GhdlService.cs b/src/OneWare.Ghdl/Services/GhdlService.cs
@@ -117,8 +117,16 @@ private async Task<bool> ElaborateAsync(IProjectFile file, TestBenchContext cont
 
         var top = Path.GetFileNameWithoutExtension(file.FullPath);
         var workingDirectory = file.Root!.FullPath;
-        List<string> ghdlOptions = ["--std=02"];
-
+
+
+        List<string> ghdlOptions = [];
+
+        var vhdlStandard = context.GetBenchProperty(nameof(GhdlSimulatorToolbarViewModel.VhdlStandard));
+        if(vhdlStandard != null) ghdlOptions.Add($"--std={vhdlStandard}");
+
+        var additionalGhdlOptions = context.GetBenchProperty(nameof(GhdlSimulatorToolbarViewModel.AdditionalGhdlOptions));
+        if(additionalGhdlOptions != null) ghdlOptions.AddRange(additionalGhdlOptions.Split(' '));
+
         List<string> ghdlInitArguments = ["-i"];
         ghdlInitArguments.AddRange(ghdlOptions);
         ghdlInitArguments.AddRange(vhdlFiles);