diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc index 1c8eec6..59bb725 100644 Binary files a/EgtGeomKernel.rc and b/EgtGeomKernel.rc differ diff --git a/EgtGeomKernel.vcxproj b/EgtGeomKernel.vcxproj index c75cf3d..ffa979b 100644 --- a/EgtGeomKernel.vcxproj +++ b/EgtGeomKernel.vcxproj @@ -118,7 +118,7 @@ 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) + C:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies) false @@ -151,7 +151,7 @@ copy $(TargetPath) \EgtProg\DllD32 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) + C:\EgtDev\Extern\OxySec\Lib\x64\oxyxlt.obj;%(AdditionalDependencies) false @@ -193,7 +193,7 @@ copy $(TargetPath) \EgtProg\DllD64 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) + C:\EgtDev\Extern\OxySec\Lib\x32\oxyxlt.obj;%(AdditionalDependencies) false @@ -234,7 +234,7 @@ copy $(TargetPath) \EgtProg\Dll32 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) + C:\EgtDev\Extern\OxySec\Lib\x64\oxyxlt.obj;%(AdditionalDependencies) false diff --git a/GeomDB.cpp b/GeomDB.cpp index 8c50a1b..666859d 100644 --- a/GeomDB.cpp +++ b/GeomDB.cpp @@ -20,7 +20,7 @@ #include "NgeReader.h" #include "NgeWriter.h" #include "/EgtDev/Include/EGkStringUtils3d.h" -#include "/EgtDev/Include/SELkMachineId.h" +#include "/EgtDev/Include/SELkLockId.h" #include "/EgtDev/Include/SELkKeyProc.h" #include "/EgtDev/Include/EgtStringConverter.h" #include "/EgtDev/Include/EgtPointerOwner.h" @@ -382,13 +382,13 @@ GeomDB::SaveHeader( NgeWriter& ngeOut) const if ( ! ngeOut.WriteInt( NGE_VER_LAST, ";", true)) return false ; - // MachineId del sistema come commento - string sMachineId ; - if ( ! GetMachineId( sMachineId)) { + // LockId del sistema come commento + string sLockId ; + if ( ! GetLockId( sLockId)) { LOG_ERROR( GetEGkLogger(), "Error on Key (1)") return false ; } - if ( ! ngeOut.WriteRemark( "LWR=" + sMachineId)) + if ( ! ngeOut.WriteRemark( "LWR=" + sLockId)) return false ; // materiale di default come colore