From 7b904ff427f9c1c56aead1969a5128406361f3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Mon, 17 Apr 2017 14:32:47 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@181
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 make_libs.bat            | 13 ++-----------
 qad_utils/qpievaluator.h |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

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 <cmath>
 #include <complex>
 
-#ifndef PIP_VERSION
+#ifndef PIP_MATH_COMPLEX
 typedef std::complex<double> complexd;
 const complexd complexd_i(0., 1.);
 const complexd complexd_0(0.);