SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows specific macros generelized.

Browse Source
This commit is contained in:
dsm 2024-07-04 10:42:54 +03:00
parent 00001fe5be
commit af687e2ba7
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qucs/components/spicedialog.cpp
View File

@ -359,7 +359,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
qDebug() << "Run spice preprocessor (perl)"; qDebug() << "Run spice preprocessor (perl)";
bool piping = true; bool piping = true;
QString script; QString script;
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
QString interpreter = "tinyperl.exe"; QString interpreter = "tinyperl.exe";
#else #else
QString interpreter = "perl"; QString interpreter = "perl";

2
qucs/components/spicefile.cpp
View File

@ -264,7 +264,7 @@ bool SpiceFile::recreateSubNetlist(QString *SpiceFile, QString *FileName)
if (preprocessor != "none") { if (preprocessor != "none") {
bool piping = true; bool piping = true;
QStringList script; QStringList script;
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
QString interpreter = "tinyperl.exe"; QString interpreter = "tinyperl.exe";
#else #else
QString interpreter = "perl"; QString interpreter = "perl";

8
qucs/dialogs/aboutdialog.cpp
View File

@ -225,19 +225,19 @@ void AboutDialog::setAuthorsText() {
QString authorsText; QString authorsText;
authorsText = tr("Qucs-S project team:"); authorsText = tr("Qucs-S project team:");
authorsText += "<ul>"; authorsText += "<ul>";
for(QString& tStr : qucs_sDevs) { for(const auto& tStr : qucs_sDevs) {
authorsText += ("<li>" + tStr + "</li>"); authorsText += ("<li>" + tStr + "</li>");
} }
authorsText += "</ul>"; authorsText += "</ul>";
authorsText += tr("Based on Qucs project developed by:") + "<ul>"; authorsText += tr("Based on Qucs project developed by:") + "<ul>";
for(QString& tStr : currAuths) { for(const auto& tStr : currAuths) {
authorsText += ("<li>" + tStr + "</li>"); authorsText += ("<li>" + tStr + "</li>");
} }
authorsText += "</ul>"; authorsText += "</ul>";
authorsText += tr("Previous Developers") + "<ul>"; authorsText += tr("Previous Developers") + "<ul>";
for(QString& tStr : prevDevs) { for(const auto& tStr : prevDevs) {
authorsText += ("<li>" + tStr + "</li>"); authorsText += ("<li>" + tStr + "</li>");
} }
authorsText += "</ul>"; authorsText += "</ul>";
@ -248,7 +248,7 @@ void AboutDialog::setAuthorsText() {
void AboutDialog::setTrText() { void AboutDialog::setTrText() {
QString trText; QString trText;
trText = tr("GUI translations :") + "<ul>"; trText = tr("GUI translations :") + "<ul>";
for(QString& tStr : trAuths) { for(const auto& tStr : trAuths) {
trText += ("<li>" + tStr + "</li>"); trText += ("<li>" + tStr + "</li>");
} }
trText += "</ul>"; trText += "</ul>";

20
qucs/dialogs/simmessage.cpp
View File

@ -47,7 +47,7 @@
#include "components/vhdlfile.h" #include "components/vhdlfile.h"
#include "misc.h" #include "misc.h"
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
#define executableSuffix ".exe" #define executableSuffix ".exe"
#else #else
#define executableSuffix "" #define executableSuffix ""
@ -324,7 +324,7 @@ void SimMessage::slotFinishSpiceNetlist(int status )
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
#include <windows.h> #include <windows.h>
static QString pathName(QString longpath) { static QString pathName(QString longpath) {
const char * lpath = QDir::toNativeSeparators(longpath).toLatin1().data(); const char * lpath = QDir::toNativeSeparators(longpath).toLatin1().data();
@ -352,7 +352,7 @@ void SimMessage::startSimulator()
QString SimTime; QString SimTime;
QStringList Arguments; QStringList Arguments;
QString SimPath = QDir::toNativeSeparators(QucsSettings.tempFilesDir.absolutePath()); QString SimPath = QDir::toNativeSeparators(QucsSettings.tempFilesDir.absolutePath());
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
QString QucsDigiLib = "qucs_mkdigilib.bat"; QString QucsDigiLib = "qucs_mkdigilib.bat";
QString QucsDigi = "qucs_run_hdl.bat"; QString QucsDigi = "qucs_run_hdl.bat";
QString QucsVeri = "qucs_run_verilog.bat"; QString QucsVeri = "qucs_run_verilog.bat";
@ -380,7 +380,7 @@ void SimMessage::startSimulator()
SimTime = Doc->SimTime; SimTime = Doc->SimTime;
QString libs = Doc->Libraries.toLower(); QString libs = Doc->Libraries.toLower();
/// \todo \bug error: unrecognized command line option '-Wl' /// \todo \bug error: unrecognized command line option '-Wl'
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
if(libs.isEmpty()) { if(libs.isEmpty()) {
libs = ""; libs = "";
} }
@ -565,7 +565,7 @@ void SimMessage::startSimulator()
<< "-c"; << "-c";
} else { } else {
/// \todo \bug error: unrecognized command line option '-Wl' /// \todo \bug error: unrecognized command line option '-Wl'
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
Program = QDir::toNativeSeparators(pathName(QucsSettings.BinDir + QucsDigi)); Program = QDir::toNativeSeparators(pathName(QucsSettings.BinDir + QucsDigi));
Arguments << QDir::toNativeSeparators(QucsSettings.tempFilesDir.filePath("netlist.txt")) Arguments << QDir::toNativeSeparators(QucsSettings.tempFilesDir.filePath("netlist.txt"))
<< DataSet << DataSet
@ -598,7 +598,7 @@ void SimMessage::startSimulator()
ProgressText = ""; ProgressText = "";
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
QString sep(";"); // path separator QString sep(";"); // path separator
#else #else
QString sep(":"); QString sep(":");
@ -758,10 +758,10 @@ void SimMessage::slotSimEnded(int exitCode, QProcess::ExitStatus exitStatus )
int stat = exitCode; int stat = exitCode;
if ((exitStatus != QProcess::NormalExit) && if ((exitStatus != QProcess::NormalExit) &&
#ifdef _WIN32 #if defined(_WIN32) || defined(__MINGW32__)
// due to a bug in Qt, negative error codes are erroneously interpreted /*! \todo: due to a bug in Qt, negative error codes are erroneously interpreted
// as "program crashed", see https://bugreports.qt.io/browse/QTBUG-28735 as "program crashed", see https://bugreports.qt.io/browse/QTBUG-28735
// When we will switch to Qt5(.1) this code can be removed... When we will switch to Qt5(.1) this code can be removed...*/
(uint)stat >= 0x80000000U && (uint)stat < 0xD0000000U && (uint)stat >= 0x80000000U && (uint)stat < 0xD0000000U &&
#endif #endif
!simKilled) { // as when killed by user exitStatus will be QProcess::CrashExit !simKilled) { // as when killed by user exitStatus will be QProcess::CrashExit

4
qucs/extsimkernels/xspice_cmbuilder.cpp
View File

@ -159,7 +159,7 @@ void XSPICE_CMbuilder::createCModelTree(QString &output)
QFile mkfile(cmdir+"/Makefile"); QFile mkfile(cmdir+"/Makefile");
if (mkfile.open(QIODevice::WriteOnly)) { if (mkfile.open(QIODevice::WriteOnly)) {
QTextStream stream(&mkfile); QTextStream stream(&mkfile);
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
QString rules_file = QucsSettings.BinDir+"../share/" QUCS_NAME "/xspice_cmlib/cmlib.mingw32.rules.mk"; QString rules_file = QucsSettings.BinDir+"../share/" QUCS_NAME "/xspice_cmlib/cmlib.mingw32.rules.mk";
#else #else
QString rules_file = QucsSettings.BinDir+"../share/" QUCS_NAME "/xspice_cmlib/cmlib.linux.rules.mk"; QString rules_file = QucsSettings.BinDir+"../share/" QUCS_NAME "/xspice_cmlib/cmlib.linux.rules.mk";
@ -341,7 +341,7 @@ void XSPICE_CMbuilder::compileCMlib(QString &output)
QProcess *make = new QProcess(); QProcess *make = new QProcess();
make->setProcessChannelMode(QProcess::MergedChannels); make->setProcessChannelMode(QProcess::MergedChannels);
make->setWorkingDirectory(cmdir); make->setWorkingDirectory(cmdir);
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
make->start("mingw32-make.exe",QStringList()); // For Unix make->start("mingw32-make.exe",QStringList()); // For Unix
#else #else
make->start("make",QStringList()); // For Unix make->start("make",QStringList()); // For Unix

8
qucs/main.cpp
View File

@ -51,11 +51,11 @@
#include "extsimkernels/ngspice.h" #include "extsimkernels/ngspice.h"
#include "extsimkernels/xyce.h" #include "extsimkernels/xyce.h"
#ifdef _WIN32 #if defined(_WIN32) ||defined(__MINGW32__)
#include <windows.h> //for OutputDebugString #include <windows.h> //for OutputDebugString
#endif #endif
#ifdef __MINGW32__ #if defined(_WIN32) ||defined(__MINGW32__)
#define executableSuffix ".exe" #define executableSuffix ".exe"
#else #else
#define executableSuffix "" #define executableSuffix ""
@ -842,7 +842,7 @@ int main(int argc, char *argv[])
else { else {
// default admsXml bindir same as Qucs // default admsXml bindir same as Qucs
QString admsExec; QString admsExec;
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml.exe"); admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml.exe");
#else #else
admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml"); admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml");
@ -859,7 +859,7 @@ int main(int argc, char *argv[])
else { else {
// default ASCO bindir same as Qucs // default ASCO bindir same as Qucs
QString ascoExec; QString ascoExec;
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco.exe"); ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco.exe");
#else #else
ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco"); ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco");

4
qucs/octave_window.cpp
View File

@ -19,7 +19,7 @@
#include "misc.h" #include "misc.h"
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
#define executableSuffix ".exe" #define executableSuffix ".exe"
#else #else
#define executableSuffix "" #define executableSuffix ""
@ -102,7 +102,7 @@ bool OctaveWindow::startOctave()
connect(&octProcess, SIGNAL(readyReadStandardError()), SLOT(slotDisplayErr())); connect(&octProcess, SIGNAL(readyReadStandardError()), SLOT(slotDisplayErr()));
connect(&octProcess, SIGNAL(readyReadStandardOutput()), SLOT(slotDisplayMsg())); connect(&octProcess, SIGNAL(readyReadStandardOutput()), SLOT(slotDisplayMsg()));
connect(&octProcess, SIGNAL(finished(int)), SLOT(slotOctaveEnded(int))); connect(&octProcess, SIGNAL(finished(int)), SLOT(slotOctaveEnded(int)));
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
QString sep(";"); // path separator QString sep(";"); // path separator
#else #else
QString sep(":"); QString sep(":");

8
qucs/qucs_actions.cpp
View File

@ -742,7 +742,7 @@ void QucsApp::editFile(const QString& File)
if (QucsSettings.Editor.toLower().contains("qucsedit")) { if (QucsSettings.Editor.toLower().contains("qucsedit")) {
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
prog = QUCS_NAME"edit.exe"; prog = QUCS_NAME"edit.exe";
#elif __APPLE__ #elif __APPLE__
prog = "qucsedit.app/Contents/MacOS/qucsedit"; prog = "qucsedit.app/Contents/MacOS/qucsedit";
@ -905,7 +905,7 @@ void QucsApp::launchTool(const QString& prog, const QString& progDesc, const QSt
QString tooldir; QString tooldir;
if (qucs_tool) tooldir = QucsSettings.QucsatorDir; if (qucs_tool) tooldir = QucsSettings.QucsatorDir;
else tooldir = QucsSettings.BinDir; else tooldir = QucsSettings.BinDir;
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
QString cmd = QDir::toNativeSeparators("\""+tooldir + prog + ".exe\""); QString cmd = QDir::toNativeSeparators("\""+tooldir + prog + ".exe\"");
#elif __APPLE__ #elif __APPLE__
QString cmd = QDir::toNativeSeparators(tooldir + prog + ".app/Contents/MacOS/" + prog); QString cmd = QDir::toNativeSeparators(tooldir + prog + ".app/Contents/MacOS/" + prog);
@ -1630,7 +1630,7 @@ void QucsApp::slotBuildModule()
QString make; QString make;
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
make = "mingw32-make.exe"; // must be on the path! make = "mingw32-make.exe"; // must be on the path!
#else #else
make = "make"; // must be on the path! make = "make"; // must be on the path!
@ -1656,7 +1656,7 @@ void QucsApp::slotBuildModule()
QString admsXml = QucsSettings.AdmsXmlBinDir.canonicalPath(); QString admsXml = QucsSettings.AdmsXmlBinDir.canonicalPath();
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml.exe"); admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml.exe");
#else #else
admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml"); admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml");

2
qucs/schematic_file.cpp
View File

@ -666,7 +666,7 @@ int Schematic::saveDocument()
//pick admsXml from settings //pick admsXml from settings
QString admsXml = QucsSettings.AdmsXmlBinDir.canonicalPath(); QString admsXml = QucsSettings.AdmsXmlBinDir.canonicalPath();
#ifdef __MINGW32__ #if defined(_WIN32) || defined(__MINGW32__)
admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml.exe"); admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml.exe");
#else #else
admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml"); admsXml = QDir::toNativeSeparators(admsXml+"/"+"admsXml");