From 85e4921ec34f56387d4d903e25ff575698f08514 Mon Sep 17 00:00:00 2001 From: Alan Steremberg Date: Wed, 30 Jun 2021 06:19:07 -0700 Subject: [PATCH] Fixed os detection and visual studio project --- verilator/sim.vcxproj | 5 ++--- verilator/sim.vcxproj.filters | 9 +++------ verilator/verilate.sh | 14 +++++++------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/verilator/sim.vcxproj b/verilator/sim.vcxproj index 71029a2..8f813ef 100644 --- a/verilator/sim.vcxproj +++ b/verilator/sim.vcxproj @@ -73,9 +73,8 @@ - - - + + diff --git a/verilator/sim.vcxproj.filters b/verilator/sim.vcxproj.filters index 422d3a1..bd7aaa8 100644 --- a/verilator/sim.vcxproj.filters +++ b/verilator/sim.vcxproj.filters @@ -18,13 +18,10 @@ Source Files - + Source Files - - Source Files - - + Source Files @@ -63,7 +60,7 @@ Source Files - + Source Files diff --git a/verilator/verilate.sh b/verilator/verilate.sh index 1280203..3f48b35 100755 --- a/verilator/verilate.sh +++ b/verilator/verilate.sh @@ -1,11 +1,6 @@ -if [[ $OSTYPE == 'darwin'* ]]; then - exit; -fi - -if [[ $OSTYPE == 'linux'* ]]; then - exit; -fi +set -e +if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null ; then verilator -cc -exe --public --compiler msvc +define+SIMULATION=1 --converge-limit 2000 --top-module emu sim.v \ ../rtl/dpram.v \ ../rtl/spram.v \ @@ -18,3 +13,8 @@ verilator -cc -exe --public --compiler msvc +define+SIMULATION=1 --converge-limi ../rtl/tv80/tv80_reg.v \ ../rtl/tv80/tv80n.v \ ../rtl/tv80/tv80s.v + else + echo "not running on windows" +fi + +