diff --git a/make_libs.bat b/make_libs.bat index 9cdb69e..b1a56bf 100644 --- a/make_libs.bat +++ b/make_libs.bat @@ -1,12 +1,3 @@ @echo off -::set root=%CD% -mkdir ..\libs_build_win -cd ..\libs_build_win && cmake_mgw ..\libs -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8 && cd ../libs && pause -:: && for %%d in (qad_widgets qad_utils qad_graphic qad_sql_table qad_application touch_widgets qad_blockview %root%) do ( -:: @if %%d == %root% ( -:: echo ______ Build Success _______ -:: cd %%d -:: ) else ( -:: cd %%d && qmake ../../libs/%%d && make install -j8 && cd .. -:: ) -::) +mkdir ../libs_build_win +cd ../libs_build_win && cmake_mgw ../libs && cmake_mgw ../libs && make install -j8 && cd ../libs && pause diff --git a/qad_utils/qpievaluator.h b/qad_utils/qpievaluator.h index 0043265..fad0afc 100644 --- a/qad_utils/qpievaluator.h +++ b/qad_utils/qpievaluator.h @@ -26,7 +26,7 @@ #include #include -#ifndef PIP_VERSION +#ifndef PIP_MATH_COMPLEX typedef std::complex complexd; const complexd complexd_i(0., 1.); const complexd complexd_0(0.);