diff options
| -rwxr-xr-x | src/maker/ModelGeneration.py | 19 | ||||
| -rw-r--r-- | src/ngspiceSimulation/NgspiceWidget.py | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/maker/ModelGeneration.py b/src/maker/ModelGeneration.py index e7bbe9c9..208664f8 100755 --- a/src/maker/ModelGeneration.py +++ b/src/maker/ModelGeneration.py @@ -834,7 +834,14 @@ and set the load for input ports */ if os.path.exists(self.modelpath + "../verilated.o"): os.remove(self.modelpath + "../verilated.o") - self.cmd = "make -f V" + self.fname.split('.')[0]\ + if os.name == 'nt': + # path to msys home directory + self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME') + self.cmd = self.msys_home + "/mingw64/bin/mingw32-make.exe" + else: + self.cmd = "make" + + self.cmd = self.cmd + " -f V" + self.fname.split('.')[0]\ + ".mk V" + self.fname.split( '.')[0] + "__ALL.a sim_main_" \ + self.fname.split('.')[0] + ".o ../verilated.o" @@ -918,9 +925,9 @@ and set the load for input ports */ try: if os.name == 'nt': - # path to msys bin directory where make is located - self.msys_bin = self.parser.get('COMPILER', 'MSYS_HOME') - self.cmd = self.msys_bin + "\\make.exe" + # path to msys home directory + self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME') + self.cmd = self.msys_home + "/mingw64/bin/mingw32-make.exe" else: self.cmd = "make" @@ -953,8 +960,8 @@ and set the load for input ports */ try: if os.name == 'nt': - self.msys_bin = self.parser.get('COMPILER', 'MSYS_HOME') - self.cmd = self.msys_bin + "\\make.exe install" + self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME') + self.cmd = self.msys_home + "/mingw64/bin/mingw32-make.exe install" else: self.cmd = "make install" print("Running Make Install") diff --git a/src/ngspiceSimulation/NgspiceWidget.py b/src/ngspiceSimulation/NgspiceWidget.py index c068d0de..6d64181d 100644 --- a/src/ngspiceSimulation/NgspiceWidget.py +++ b/src/ngspiceSimulation/NgspiceWidget.py @@ -29,13 +29,13 @@ class NgspiceWidget(QtWidgets.QWidget): parser_nghdl.read(os.path.join( home, os.path.join('.nghdl', 'config.ini'))) - msys_bin = parser_nghdl.get('COMPILER', 'MSYS_HOME') + msys_home = parser_nghdl.get('COMPILER', 'MSYS_HOME') tempdir = os.getcwd() projPath = self.obj_appconfig.current_project["ProjectName"] os.chdir(projPath) self.command = 'cmd /c '+'"start /min ' + \ - msys_bin + "/mintty.exe ngspice -p " + command + '"' + msys_home + "/usr/bin/mintty.exe ngspice -p " + command + '"' self.process.start(self.command) os.chdir(tempdir) |