From a22e4ba234ab8b54647852a77de5e171c0a7cbe3 Mon Sep 17 00:00:00 2001 From: dsm <41967334+dsm@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:49:51 +0300 Subject: [PATCH] add msvc build support. - added msvc compiler flags. - fixed wrong file encoding. - change VLA to fixed or dynamic array for msvc. - succesfully build with qt6.5.0 and vs2019 on win10 native. --- qucs-activefilter/CMakeLists.txt | 2 +- qucs-attenuator/CMakeLists.txt | 2 +- qucs-filter/CMakeLists.txt | 2 +- qucs-filter/qf_cauer.cpp | 2 +- qucs-filter/qf_poly.cpp | 8 ++++---- qucs-filter/qf_poly.h | 4 ++-- qucs-powercombining/CMakeLists.txt | 2 +- qucs-powercombining/qucspowercombiningtool.cpp | 7 ++++--- qucs-transcalc/CMakeLists.txt | 2 +- qucs/CMakeLists.txt | 2 +- qucs/projectView.h | 12 ++++++++++-- 11 files changed, 27 insertions(+), 18 deletions(-) diff --git a/qucs-activefilter/CMakeLists.txt b/qucs-activefilter/CMakeLists.txt index 0ac86a79..4dbba956 100644 --- a/qucs-activefilter/CMakeLists.txt +++ b/qucs-activefilter/CMakeLists.txt @@ -58,7 +58,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ENDIF() if (MSVC) - + add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor) else() # additional warnings add_compile_options(-Wall -Wextra) diff --git a/qucs-attenuator/CMakeLists.txt b/qucs-attenuator/CMakeLists.txt index 8f771d69..90e5311a 100644 --- a/qucs-attenuator/CMakeLists.txt +++ b/qucs-attenuator/CMakeLists.txt @@ -45,7 +45,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ENDIF() if (MSVC) - + add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor) else() # additional warnings add_compile_options(-Wall -Wextra) diff --git a/qucs-filter/CMakeLists.txt b/qucs-filter/CMakeLists.txt index 35561010..f61b492b 100644 --- a/qucs-filter/CMakeLists.txt +++ b/qucs-filter/CMakeLists.txt @@ -46,7 +46,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ENDIF() if (MSVC) - + add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor) else() # additional warnings add_compile_options(-Wall -Wextra) diff --git a/qucs-filter/qf_cauer.cpp b/qucs-filter/qf_cauer.cpp index c1458625..c6c2f76e 100644 --- a/qucs-filter/qf_cauer.cpp +++ b/qucs-filter/qf_cauer.cpp @@ -308,7 +308,7 @@ void qf_cauer::xfer (void) { #ifdef _QF_CAUER_DEBUG std::cerr << "Computing filter of order " << ord << " with "; - std::cerr << "rho = " << rho << " and theta = " << ASIND (th) << "°\n"; + std::cerr << "rho = " << rho << " and theta = " << ASIND (th) << "°\n"; std::cerr << "k = " << k << '\n'; #endif diff --git a/qucs-filter/qf_poly.cpp b/qucs-filter/qf_poly.cpp index 7e927e72..f1d9da29 100644 --- a/qucs-filter/qf_poly.cpp +++ b/qucs-filter/qf_poly.cpp @@ -46,7 +46,7 @@ qf_poly::qf_poly (qf_double_t a, qf_double_t b, qf_double_t c, unsigned deg) { #ifdef _QF_POLY_DEBUG std::cout << "qf_poly (ax^2+bx+c), a = " << a << ", b = " << b - << ", c = " << c << ", d° = " << deg << "\n"; + << ", c = " << c << ", d° = " << deg << "\n"; #endif // Pathological cases @@ -67,7 +67,7 @@ qf_poly::qf_poly (qf_double_t a, qf_double_t b, qf_double_t c, unsigned deg) { d = 0; p = new qf_double_t[1]; p[0] = a; - rts = NULL; // no root (or an infinite # of them) + rts = NULL; // no root (or an infinite # of them) krts = a; rep = BOTH; break; @@ -84,7 +84,7 @@ qf_poly::qf_poly (qf_double_t a, qf_double_t b, qf_double_t c, unsigned deg) { rep = BOTH; break; default: - // Polynom of d° 2 (aX^2 + bX + c) + // Polynom of d° 2 (aX^2 + bX + c) if (deg > 2) std::cout << "Warning: qf_poly called with deg > 2.\n"; d = 2; @@ -214,7 +214,7 @@ qf_double_t & qf_poly::operator [] (int i) { return rts[i]; } -// Returns d° (order) of polynom +// Returns d° (order) of polynom unsigned qf_poly::deg () { return d; } diff --git a/qucs-filter/qf_poly.h b/qucs-filter/qf_poly.h index 7bd21e28..30d4f618 100644 --- a/qucs-filter/qf_poly.h +++ b/qucs-filter/qf_poly.h @@ -54,8 +54,8 @@ class qf_poly public: qf_poly (); - qf_poly (unsigned); // id with d° - qf_poly (qf_double_t, qf_double_t, qf_double_t, unsigned); // Up to d°=2 + qf_poly (unsigned); // id with d° + qf_poly (qf_double_t, qf_double_t, qf_double_t, unsigned); // Up to d°=2 qf_poly (int, const qf_double_t[]); // Id, with inst. qf_poly (int, qf_double_t, const qf_double_t[]); qf_poly (const qf_poly &); // Copy diff --git a/qucs-powercombining/CMakeLists.txt b/qucs-powercombining/CMakeLists.txt index c2accff3..cf280474 100644 --- a/qucs-powercombining/CMakeLists.txt +++ b/qucs-powercombining/CMakeLists.txt @@ -57,7 +57,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ENDIF() if (MSVC) - + add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor) else() # additional warnings add_compile_options(-Wall -Wextra) diff --git a/qucs-powercombining/qucspowercombiningtool.cpp b/qucs-powercombining/qucspowercombiningtool.cpp index 3905d970..b6aa231d 100644 --- a/qucs-powercombining/qucspowercombiningtool.cpp +++ b/qucs-powercombining/qucspowercombiningtool.cpp @@ -794,7 +794,7 @@ QString QucsPowerCombiningTool::calcChebyLines(double RL, double Z0, double gamm //double sec_theta_m = cosh((1/(1.*N))*acosh(fabs(log(RL/Z0)/(2*gamma))) ); (fabs(log(RL/Z0)/(2*gamma)) < 1) ? sec_theta_m = 0 : sec_theta_m = cosh((1/(1.*N))*acosh(fabs(log(RL/Z0)/(2*gamma))) ); - double w[N]; + double w[7]; // for msvc predefined size. switch(N)//The weights are calculated by equating the reflection coeffient formula to the N-th Chebyshev polinomial { @@ -885,7 +885,9 @@ int QucsPowerCombiningTool::MultistageWilkinson(double Z0, double Freq, int NSta double lambda = SPEED_OF_LIGHT/(Freq); double lambda4=lambda/4, W; double alpha; - double C[NStages], L[NStages]; + + auto C = new double[NStages]; + auto L = new double[NStages]; if (LumpedElements)//CLC pi equivalent calculation { double w = 2*M_PI*Freq; @@ -896,7 +898,6 @@ int QucsPowerCombiningTool::MultistageWilkinson(double Z0, double Freq, int NSta L[j] = Zi/w; C[j] = 1./(L[j]*w*w); } - } diff --git a/qucs-transcalc/CMakeLists.txt b/qucs-transcalc/CMakeLists.txt index fcaafcbf..c805ca98 100644 --- a/qucs-transcalc/CMakeLists.txt +++ b/qucs-transcalc/CMakeLists.txt @@ -45,7 +45,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ENDIF() if (MSVC) - + add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor) else() # additional warnings add_compile_options(-Wall -Wextra) diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt index 045b8ec9..86b27424 100755 --- a/qucs/CMakeLists.txt +++ b/qucs/CMakeLists.txt @@ -87,7 +87,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ENDIF() if (MSVC) - + add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor) else() # additional warnings add_compile_options(-Wall -Wextra) diff --git a/qucs/projectView.h b/qucs/projectView.h index 52661d73..47a3b1d0 100644 --- a/qucs/projectView.h +++ b/qucs/projectView.h @@ -27,12 +27,20 @@ #include #include -#define APPEND_ROW(parent, data) \ +/*#define APPEND_ROW(parent, data) \ ({ \ QList c; \ c.append(new QStandardItem(data)); \ parent->appendRow(c); \ -}) +})*/ + + +#define APPEND_ROW(parent, data) \ +if(1){ \ + QList c; \ + c.append(new QStandardItem(data)); \ + parent->appendRow(c); \ +} class QStandardItemModel;