Merge commit 'c3b11ee4bb52e24fe73009eef4bad52c07474ea0' into SaraP

This commit is contained in:
SaraP
2021-09-07 14:49:37 +02:00
4 changed files with 6 additions and 2 deletions
+1
View File
@@ -36,5 +36,6 @@ class __declspec( novtable) IImportBtl
//-----------------------------------------------------------------------------
extern "C" {
EEX_EXPORT bool SetBtlAuxDir( const std::string& sBtlAuxDir) ;
EEX_EXPORT IImportBtl* CreateImportBtl( void) ;
}
+1
View File
@@ -100,6 +100,7 @@ EIN_EXPORT BOOL __stdcall EgtSaveMachGroupToFile( int nMGroupId, const wchar_t*
// Exchange
EIN_EXPORT int __stdcall EgtGetFileType( const wchar_t* wsFilePath) ;
EIN_EXPORT BOOL __stdcall EgtSetBtlAuxDir( const wchar_t* wsBtlAuxDir) ;
EIN_EXPORT BOOL __stdcall EgtImportBtl( const wchar_t* wsFilePath, int nFlag) ;
EIN_EXPORT BOOL __stdcall EgtImportBtlx( const wchar_t* wsFilePath, int nFlag) ;
EIN_EXPORT BOOL __stdcall EgtImportCnc( const wchar_t* wsFilePath, int nFlag) ;
+1
View File
@@ -107,6 +107,7 @@ EXE_EXPORT bool ExeSaveMachGroupToFile( int nMGroupId, const std::string& sFileP
// Exchange
EXE_EXPORT int ExeGetFileType( const std::string& sFilePath) ;
EXE_EXPORT bool ExeSetBtlAuxDir( const std::string& sBtlAuxDir) ;
EXE_EXPORT bool ExeImportBtl( const std::string& sFilePath, int nFlag) ;
EXE_EXPORT bool ExeImportBtlx( const std::string& sFilePath, int nFlag) ;
EXE_EXPORT bool ExeImportCnc( const std::string& sFilePath, int nFlag) ;
+3 -2
View File
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------------
// EgalTech 2015-2021
//----------------------------------------------------------------------------
// File : EgtKeyCodes.h Data : 31.07.21 Versione : 2.3h1
// File : EgtKeyCodes.h Data : 06.09.21 Versione : 2.3i1
// Contenuto : Costanti per codici di protezione librerie di base.
//
//
@@ -14,6 +14,7 @@
// 01.08.19 DS Portato a 21 KEY_BASELIB_VER.
// 22.02.20 DS Aggiunta costante KEYOPT_EMK_NC_OFF.
// 04.08.20 DS Portato a 22 KEY_BASELIB_VER.
// 01.01.21 DS Nuova gestione KEY_BASELIB_VER con versione prodotto e mese.
//
//----------------------------------------------------------------------------
@@ -21,7 +22,7 @@
//----------------------------------------------------------------------------
const int KEY_BASELIB_PROD = 207 ;
const int KEY_BASELIB_VER = 2308 ;
const int KEY_BASELIB_VER = 2309 ;
const int KEY_BASELIB_LEV = 1 ;
//----------------------------------------------------------------------------