diff --git a/ENkDllMain.cpp b/ENkDllMain.cpp
index 85c71a2..4fb30a0 100644
--- a/ENkDllMain.cpp
+++ b/ENkDllMain.cpp
@@ -18,10 +18,18 @@
#include "\EgtDev\Include\EgtTrace.h"
//--------------------------- Costanti ----------------------------------------
-#if defined( _DEBUG)
- const char* ENK_STR = "EgtNumKernelD32.dll ver. " ;
-#else
- const char* ENK_STR = "EgtNumKernelR32.dll ver. " ;
+#if defined( _WIN64)
+ #if defined( _DEBUG)
+ const char* ENK_STR = "EgtNumKernelD64.dll ver. " ;
+ #else
+ const char* ENK_STR = "EgtNumKernelR64.dll ver. " ;
+ #endif
+#elif defined( _WIN32)
+ #if defined( _DEBUG)
+ const char* ENK_STR = "EgtNumKernelD32.dll ver. " ;
+ #else
+ const char* ENK_STR = "EgtNumKernelR32.dll ver. " ;
+ #endif
#endif
const int STR_DIM = 40 ;
diff --git a/EgtNumKernel.rc b/EgtNumKernel.rc
index 739fc70..3c8dd94 100644
Binary files a/EgtNumKernel.rc and b/EgtNumKernel.rc differ
diff --git a/EgtNumKernel.sln b/EgtNumKernel.sln
index dec073f..9cee7a3 100644
--- a/EgtNumKernel.sln
+++ b/EgtNumKernel.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
{E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Debug|Win32.ActiveCfg = Debug|Win32
{E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Debug|Win32.Build.0 = Debug|Win32
+ {E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Debug|x64.ActiveCfg = Debug|x64
+ {E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Debug|x64.Build.0 = Debug|x64
{E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Release|Win32.ActiveCfg = Release|Win32
{E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Release|Win32.Build.0 = Release|Win32
+ {E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Release|x64.ActiveCfg = Release|x64
+ {E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/EgtNumKernel.vcxproj b/EgtNumKernel.vcxproj
index 39488c2..caa46f5 100644
--- a/EgtNumKernel.vcxproj
+++ b/EgtNumKernel.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{E47BBFD0-36EA-4EC1-9D6D-B05CA9C092C6}
@@ -21,21 +29,38 @@
true
Unicode
+
+ DynamicLibrary
+ true
+ Unicode
+
DynamicLibrary
false
true
Unicode
+
+ DynamicLibrary
+ false
+ true
+ Unicode
+
+
+
+
+
+
+
true
@@ -43,12 +68,24 @@
$(Configuration)$(PlatformArchitecture)\
$(ProjectName)D$(PlatformArchitecture)
+
+ true
+ $(SolutionDir)$(Configuration)$(PlatformArchitecture)\
+ $(Configuration)$(PlatformArchitecture)\
+ $(ProjectName)D$(PlatformArchitecture)
+
false
$(SolutionDir)$(Configuration)$(PlatformArchitecture)\
$(Configuration)$(PlatformArchitecture)\
$(ProjectName)R$(PlatformArchitecture)
+
+ false
+ $(SolutionDir)$(Configuration)$(PlatformArchitecture)\
+ $(Configuration)$(PlatformArchitecture)\
+ $(ProjectName)R$(PlatformArchitecture)
+
Use
@@ -67,7 +104,28 @@ copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
copy $(TargetPath) \EgtProg\Dll
- _UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)
+ _UNICODE;UNICODE;_DEBUG;_DEB32;%(PreprocessorDefinitions)
+
+
+
+
+ Use
+ Level3
+ Disabled
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;I_AM_ENK;%(PreprocessorDefinitions)
+ true
+
+
+ Windows
+ true
+
+
+ copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
+copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
+copy $(TargetPath) \EgtProg\Dll
+
+
+ _UNICODE;UNICODE;_DEBUG;_DEB64;%(PreprocessorDefinitions)
@@ -91,7 +149,31 @@ copy $(TargetPath) \EgtProg\Dll
copy $(TargetPath) \EgtProg\Dll
- _UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)
+ _UNICODE;UNICODE;NDEBUG;NDEB32;%(PreprocessorDefinitions)
+
+
+
+
+ Level3
+ Use
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;I_AM_ENK;%(PreprocessorDefinitions)
+ true
+
+
+ Windows
+ false
+ true
+ true
+
+
+ copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
+copy $(TargetPath) \EgtProg\Dll
+
+
+ _UNICODE;UNICODE;NDEBUG;NDEB64;%(PreprocessorDefinitions)
@@ -102,7 +184,9 @@ copy $(TargetPath) \EgtProg\Dll
Create
+ Create
Create
+ Create
diff --git a/Polynomial.cpp b/Polynomial.cpp
index 1149f59..8fcdb94 100644
--- a/Polynomial.cpp
+++ b/Polynomial.cpp
@@ -203,7 +203,7 @@ Polynomial::FindRoots( DBLVECTOR& vdRoot)
int
FilterMultipleAndOutOfRangeRoots( DBLVECTOR& vRoots, double dMin, double dMax, double dEps)
{
- int nZ = vRoots.size() ;
+ int nZ = (int) vRoots.size() ;
for ( int i = 0 ; i < nZ ;) {
if ( vRoots[i] < dMin || vRoots[i] > dMax ||
( i >= 1 && fabs( vRoots[i]- vRoots[i-1]) < dEps)) {
diff --git a/PolynomialRoots.cpp b/PolynomialRoots.cpp
index 02c5dfe..d5bb26e 100644
--- a/PolynomialRoots.cpp
+++ b/PolynomialRoots.cpp
@@ -70,7 +70,7 @@ PolynomialRoots( int nDegree, DBLVECTOR& vdPoly, DBLVECTOR& vdRoot, int* pnIter)
vdRoot.push_back( dZreal[i]) ;
}
}
- nZeros = vdRoot.size() ;
+ nZeros = (int) vdRoot.size() ;
// ordino le radici in senso decrescente
SortRoots( nZeros, vdRoot.data()) ;
diff --git a/resource.h b/resource.h
index 9614989..a332f16 100644
Binary files a/resource.h and b/resource.h differ