diff --git a/EExDllMain.h b/EExDllMain.h index 93865ce..122d030 100644 --- a/EExDllMain.h +++ b/EExDllMain.h @@ -13,6 +13,7 @@ #pragma once +#include class ILogger ; @@ -25,6 +26,11 @@ class ILogger ; #endif //----------------------------------------------------------------------------- -EEX_EXPORT const char* GetEExVersion( void) ; -// permette di impostare il logger per la Dll -EEX_EXPORT void SetEExLogger( ILogger* pLogger) ; +extern "C" { + // restituisce la versione della Dll + EEX_EXPORT const char* GetEExVersion( void) ; + // permette di impostare il logger per la Dll + EEX_EXPORT void SetEExLogger( ILogger* pLogger) ; + // imposta la chiave di protezione + EEX_EXPORT void SetEExKey( const std::string& sKey) ; +} \ No newline at end of file diff --git a/EExExcExecutor.h b/EExExcExecutor.h index 6eab13e..e23ee41 100644 --- a/EExExcExecutor.h +++ b/EExExcExecutor.h @@ -34,4 +34,6 @@ class __declspec( novtable) IExcExecutor : public ICmdExecutor } ; //---------------------------------------------------------------------------- -EEX_EXPORT IExcExecutor* CreateExcExecutor( void) ; +extern "C" { + EEX_EXPORT IExcExecutor* CreateExcExecutor(void) ; +} \ No newline at end of file diff --git a/EExExportDxf.h b/EExExportDxf.h index b3c225a..129cb51 100644 --- a/EExExportDxf.h +++ b/EExExportDxf.h @@ -35,4 +35,6 @@ class __declspec( novtable) IExportDxf } ; //----------------------------------------------------------------------------- -EEX_EXPORT IExportDxf* CreateExportDxf( void) ; +extern "C" { + EEX_EXPORT IExportDxf* CreateExportDxf(void) ; +} diff --git a/EExExportStl.h b/EExExportStl.h index 3a3629a..2dc95a8 100644 --- a/EExExportStl.h +++ b/EExExportStl.h @@ -35,4 +35,6 @@ class __declspec( novtable) IExportStl } ; //----------------------------------------------------------------------------- -EEX_EXPORT IExportStl* CreateExportStl( void) ; +extern "C" { + EEX_EXPORT IExportStl* CreateExportStl(void) ; +} diff --git a/EExImportCnc.h b/EExImportCnc.h index 7679aa5..751a713 100644 --- a/EExImportCnc.h +++ b/EExImportCnc.h @@ -33,4 +33,6 @@ class __declspec( novtable) IImportCnc } ; //----------------------------------------------------------------------------- -EEX_EXPORT IImportCnc* CreateImportCnc( void) ; \ No newline at end of file +extern "C" { + EEX_EXPORT IImportCnc* CreateImportCnc( void) ; +} diff --git a/EExImportDxf.h b/EExImportDxf.h index a8cb5b8..efb4072 100644 --- a/EExImportDxf.h +++ b/EExImportDxf.h @@ -35,4 +35,6 @@ class __declspec( novtable) IImportDxf } ; //----------------------------------------------------------------------------- -EEX_EXPORT IImportDxf* CreateImportDxf( void) ; \ No newline at end of file +extern "C" { + EEX_EXPORT IImportDxf* CreateImportDxf(void) ; +} diff --git a/EExImportStl.h b/EExImportStl.h index fb82a32..30930c7 100644 --- a/EExImportStl.h +++ b/EExImportStl.h @@ -33,4 +33,6 @@ class __declspec( novtable) IImportStl } ; //----------------------------------------------------------------------------- -EEX_EXPORT IImportStl* CreateImportStl( void) ; \ No newline at end of file +extern "C" { + EEX_EXPORT IImportStl* CreateImportStl( void) ; +} diff --git a/EGrDllMain.h b/EGrDllMain.h index 85337c8..8c233ce 100644 --- a/EGrDllMain.h +++ b/EGrDllMain.h @@ -25,6 +25,11 @@ class ILogger ; #endif //----------------------------------------------------------------------------- -EGR_EXPORT const char* GetEGrVersion( void) ; -// permette di impostare il logger per la Dll -EGR_EXPORT void SetEGrLogger( ILogger* pLogger) ; +extern "C" { + // restituisce la versione della Dll + EGR_EXPORT const char* GetEGrVersion( void) ; + // permette di impostare il logger per la Dll + EGR_EXPORT void SetEGrLogger( ILogger* pLogger) ; + // imposta la chiave di protezione + EGR_EXPORT void SetEGrKey( const std::string& sKey) ; +} \ No newline at end of file diff --git a/EGrSceExecutor.h b/EGrSceExecutor.h index f60baed..508ad4c 100644 --- a/EGrSceExecutor.h +++ b/EGrSceExecutor.h @@ -35,4 +35,6 @@ class __declspec( novtable) ISceExecutor : public ICmdExecutor } ; //---------------------------------------------------------------------------- -EGR_EXPORT ISceExecutor* CreateSceExecutor( void) ; +extern "C" { + EGR_EXPORT ISceExecutor* CreateSceExecutor(void) ; +} diff --git a/EGrScene.h b/EGrScene.h index 937f699..ce08959 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -117,8 +117,9 @@ class IEGrScene } ; //----------------------------------------------------------------------------- -EGR_EXPORT IEGrScene* CreateEGrScene( void) ; - +extern "C" { + EGR_EXPORT IEGrScene* CreateEGrScene(void) ; +} //------------------------ Costanti per tipo di driver OpenGL ---------------- enum OglDriver { OD_SOFT = 1, diff --git a/EMkDllMain.h b/EMkDllMain.h index 2bc0c49..568e0d4 100644 --- a/EMkDllMain.h +++ b/EMkDllMain.h @@ -26,9 +26,11 @@ class ILogger ; #endif //----------------------------------------------------------------------------- -// restituisce la versione della Dll (stringa del tipo 1.4a5) -EMK_EXPORT const char* GetEMkVersion( void) ; -// permette di impostare il logger per la Dll -EMK_EXPORT void SetEMkLogger( ILogger* pLogger) ; -// imposta la chiave di protezione -EMK_EXPORT void SetEMkKey( const std::string& sKey) ; +extern "C" { + // restituisce la versione della Dll + EMK_EXPORT const char* GetEMkVersion( void) ; + // permette di impostare il logger per la Dll + EMK_EXPORT void SetEMkLogger( ILogger* pLogger) ; + // imposta la chiave di protezione + EMK_EXPORT void SetEMkKey( const std::string& sKey) ; +} \ No newline at end of file diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 0093359..533f846 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -33,4 +33,6 @@ class __declspec( novtable) IMachMgr } ; //----------------------------------------------------------------------------- -EMK_EXPORT IMachMgr* CreateMachMgr( void) ; \ No newline at end of file +extern "C" { + EMK_EXPORT IMachMgr* CreateMachMgr(void) ; +} \ No newline at end of file diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h new file mode 100644 index 0000000..df6ca39 --- /dev/null +++ b/EgtKeyCodes.h @@ -0,0 +1,29 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : EgtKeyCodes.h Data : 27.03.15 Versione : 1.6c9 +// Contenuto : Costanti per codici di protezione librerie di base. +// +// +// +// Modifiche : 27.03.15 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +//---------------------------------------------------------------------------- +const int KEY_BASELIB_PROD = 1231 ; +const int KEY_BASELIB_VER = 16 ; +const int KEY_BASELIB_LEV = 1 ; + +//---------------------------------------------------------------------------- +const int KEYOPT_EGK_BASE = 0x00001 ; // EgtGeomKernel base +const int KEYOPT_EGK_SAVE = 0x00002 ; // EgtGeomKernel salvataggio +const int KEYOPT_EGR_BASE = 0x00004 ; // EgtGraphics +const int KEYOPT_EEX_INPBASE = 0x00008 ; // EgtExchange import base +const int KEYOPT_EEX_INPADV = 0x00010 ; // EgtExchange import avanzato +const int KEYOPT_EEX_EXPBASE = 0x00020 ; // EgtExchange export base +const int KEYOPT_EEX_EXPADV = 0x00040 ; // EgtExchange export avanzato +const int KEYOPT_EMK_BASE = 0x00080 ; // EgtMachKernel lavorazioni base