diff --git a/DistPointArc.h b/DistPointArc.h
index c7d6891..2c70a4a 100644
--- a/DistPointArc.h
+++ b/DistPointArc.h
@@ -29,7 +29,7 @@ class DistPointArc
public :
bool GetSqDist( double& dSqDist) ;
bool GetDist( double& dDist) ;
- int GetNbrMinDist( void) { return m_Info.size() ; }
+ int GetNbrMinDist( void) { return (int) m_Info.size() ; }
bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) ;
bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) ;
diff --git a/DistPointCrvBezier.h b/DistPointCrvBezier.h
index f7d36d3..b278d93 100644
--- a/DistPointCrvBezier.h
+++ b/DistPointCrvBezier.h
@@ -29,7 +29,7 @@ class DistPointCrvBezier
public :
bool GetSqDist( double& dSqDist) ;
bool GetDist( double& dDist) ;
- int GetNbrMinDist( void) { return m_Info.size() ; }
+ int GetNbrMinDist( void) { return (int) m_Info.size() ; }
bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) ;
bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) ;
diff --git a/DistPointCrvComposite.h b/DistPointCrvComposite.h
index cedd565..3c050b3 100644
--- a/DistPointCrvComposite.h
+++ b/DistPointCrvComposite.h
@@ -28,7 +28,7 @@ class DistPointCrvComposite
public :
bool GetSqDist( double& dSqDist) ;
bool GetDist( double& dDist) ;
- int GetNbrMinDist( void) { return m_Info.size() ; }
+ int GetNbrMinDist( void) { return (int) m_Info.size() ; }
bool GetMinDistPoint( int nInd, Point3d& ptMinDist, int& nFlag) ;
bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) ;
diff --git a/EGkDllMain.cpp b/EGkDllMain.cpp
index 18ff73b..fcea68c 100644
--- a/EGkDllMain.cpp
+++ b/EGkDllMain.cpp
@@ -18,10 +18,18 @@
#include "\EgtDev\Include\EgtTrace.h"
//--------------------------- Costanti ----------------------------------------
-#if defined( _DEBUG)
- const char* EGK_STR = "EgtGeomKernelD32.dll ver. " ;
-#else
- const char* EGK_STR = "EgtGeomKernelR32.dll ver. " ;
+#if defined( _WIN64)
+ #if defined( _DEBUG)
+ const char* EGK_STR = "EgtGeomKernelD64.dll ver. " ;
+ #else
+ const char* EGK_STR = "EgtGeomKernelR64.dll ver. " ;
+ #endif
+#elif defined( _WIN32)
+ #if defined( _DEBUG)
+ const char* EGK_STR = "EgtGeomKernelD32.dll ver. " ;
+ #else
+ const char* EGK_STR = "EgtGeomKernelR32.dll ver. " ;
+ #endif
#endif
const int STR_DIM = 40 ;
diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index d7aefc2..1c27a35 100644
Binary files a/EgtGeomKernel.rc and b/EgtGeomKernel.rc differ
diff --git a/EgtGeomKernel.sln b/EgtGeomKernel.sln
index 69832cc..f30a74e 100644
--- a/EgtGeomKernel.sln
+++ b/EgtGeomKernel.sln
@@ -6,13 +6,19 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9A98A202-2853-454A-84CA-DCD1714176C9}.Debug|Win32.ActiveCfg = Debug|Win32
{9A98A202-2853-454A-84CA-DCD1714176C9}.Debug|Win32.Build.0 = Debug|Win32
+ {9A98A202-2853-454A-84CA-DCD1714176C9}.Debug|x64.ActiveCfg = Debug|x64
+ {9A98A202-2853-454A-84CA-DCD1714176C9}.Debug|x64.Build.0 = Debug|x64
{9A98A202-2853-454A-84CA-DCD1714176C9}.Release|Win32.ActiveCfg = Release|Win32
{9A98A202-2853-454A-84CA-DCD1714176C9}.Release|Win32.Build.0 = Release|Win32
+ {9A98A202-2853-454A-84CA-DCD1714176C9}.Release|x64.ActiveCfg = Release|x64
+ {9A98A202-2853-454A-84CA-DCD1714176C9}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/EgtGeomKernel.vcxproj b/EgtGeomKernel.vcxproj
index acb8aa8..11707c8 100644
--- a/EgtGeomKernel.vcxproj
+++ b/EgtGeomKernel.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{9A98A202-2853-454A-84CA-DCD1714176C9}
@@ -22,6 +30,12 @@
Unicode
false
+
+ DynamicLibrary
+ true
+ Unicode
+ false
+
DynamicLibrary
false
@@ -29,15 +43,28 @@
Unicode
false
+
+ DynamicLibrary
+ false
+ true
+ Unicode
+ false
+
+
+
+
+
+
+
true
@@ -45,12 +72,24 @@
$(SolutionDir)$(Configuration)$(PlatformArchitecture)\
$(Configuration)$(PlatformArchitecture)\
+
+ true
+ $(ProjectName)D$(PlatformArchitecture)
+ $(SolutionDir)$(Configuration)$(PlatformArchitecture)\
+ $(Configuration)$(PlatformArchitecture)\
+
false
$(ProjectName)R$(PlatformArchitecture)
$(SolutionDir)$(Configuration)$(PlatformArchitecture)\
$(Configuration)$(PlatformArchitecture)\
+
+ false
+ $(ProjectName)R$(PlatformArchitecture)
+ $(SolutionDir)$(Configuration)$(PlatformArchitecture)\
+ $(Configuration)$(PlatformArchitecture)\
+
Use
@@ -74,7 +113,39 @@
0x0409
+ _DEBUG;_DEB32;%(PreprocessorDefinitions)
+ $(IntDir);%(AdditionalIncludeDirectories)
+
+
+ copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
+copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
+copy $(TargetPath) \EgtProg\Dll
+
+
+
+
+ Use
+ Level3
+ Disabled
+ WIN32;_WINDOWS;I_AM_EGK;_DEBUG;_USRDLL;%(PreprocessorDefinitions)
+ true
+ CompileAsCpp
+ false
+
+
+ Windows
+ true
+
+
+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies)
+
+
+ false
_DEBUG;%(PreprocessorDefinitions)
+
+
+ 0x0409
+ _DEBUG;_DEB64;%(PreprocessorDefinitions)
$(IntDir);%(AdditionalIncludeDirectories)
@@ -109,7 +180,41 @@ copy $(TargetPath) \EgtProg\Dll
0x0409
+ NDEBUG;NDEB32;%(PreprocessorDefinitions)
+ $(IntDir);%(AdditionalIncludeDirectories)
+
+
+ copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
+copy $(TargetPath) \EgtProg\Dll
+
+
+
+
+ Level3
+ Use
+ MaxSpeed
+ true
+ true
+ WIN32;_WINDOWS;I_AM_EGK;NDEBUG;_USRDLL;%(PreprocessorDefinitions)
+ true
+ CompileAsCpp
+
+
+ Windows
+ false
+ true
+ true
+
+
+ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;version.lib;%(AdditionalDependencies)
+
+
+ false
NDEBUG;%(PreprocessorDefinitions)
+
+
+ 0x0409
+ NDEBUG;NDEB64;%(PreprocessorDefinitions)
$(IntDir);%(AdditionalIncludeDirectories)
@@ -148,7 +253,9 @@ copy $(TargetPath) \EgtProg\Dll
Create
+ Create
Create
+ Create
diff --git a/Resource.h b/Resource.h
index 9a2df04..2b6c496 100644
Binary files a/Resource.h and b/Resource.h differ