From d12edf7070dcc55af658db9488d2aaf2b6b9b579 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 17 Jan 2014 17:22:26 +0000 Subject: [PATCH] Include : modifiche per versioni a 64bit. --- EGkDistPointCurve.h | 2 +- EgtLibVer.h | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/EGkDistPointCurve.h b/EGkDistPointCurve.h index aee91a6..b75038f 100644 --- a/EGkDistPointCurve.h +++ b/EGkDistPointCurve.h @@ -47,7 +47,7 @@ class DistPointCurve public : EGK_EXPORT bool GetSqDist( double& dSqDist) ; EGK_EXPORT bool GetDist( double& dDist) ; - EGK_EXPORT int GetNbrMinDist( void) { return m_Info.size() ; } + EGK_EXPORT int GetNbrMinDist( void) { return (int) m_Info.size() ; } EGK_EXPORT bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) ; EGK_EXPORT bool GetMinDistPoint( double dNearParam, Point3d& ptMinDist, int& nFlag) ; EGK_EXPORT bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) ; diff --git a/EgtLibVer.h b/EgtLibVer.h index 8407a6f..c20a437 100644 --- a/EgtLibVer.h +++ b/EgtLibVer.h @@ -17,9 +17,17 @@ #define EGTLIBDIR "/EgtDev/Lib/" // Dichiarazione suffisso librerie -#if defined( _DEBUG) - #define EGTLIBVER "D32" -#else - #define EGTLIBVER "R32" -#endif +#if defined( _WIN64) + #if defined( _DEBUG) + #define EGTLIBVER "D64" + #else + #define EGTLIBVER "R64" + #endif +#elif defined( _WIN32) + #if defined( _DEBUG) + #define EGTLIBVER "D32" + #else + #define EGTLIBVER "R32" + #endif +#endif