From 1d2aef267cb588f9ad18fc2667db5c23ce21d49a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 21 Nov 2013 17:16:59 +0000 Subject: [PATCH] Include : aggiunti header per versioni DLL. --- EGkFrame3d.h | 2 +- EGkGeoObj.h | 2 +- EGkGeoObjType.h | 4 ++-- EGkPoint3d.h | 2 +- EGkVector3d.h | 2 +- EGkVersion.h | 27 +++++++++++++++++++++++++++ EGnScan.h | 2 +- EGnStringConverter.h | 2 +- EGnStringUtils.h | 2 +- EGnVersion.h | 27 +++++++++++++++++++++++++++ EgtLibVer.h | 2 +- EgtTrace.h | 2 +- 12 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 EGkVersion.h create mode 100644 EGnVersion.h diff --git a/EGkFrame3d.h b/EGkFrame3d.h index bc15fcc..b3401db 100644 --- a/EGkFrame3d.h +++ b/EGkFrame3d.h @@ -17,7 +17,7 @@ //----------------------- Macro per import/export ---------------------------- #undef EGK_EXPORT -#ifdef I_AM_EGK // da definirsi solo nei moduli della DLL +#if defined( I_AM_EGK) // da definirsi solo nella DLL #define EGK_EXPORT __declspec( dllexport) #else #define EGK_EXPORT __declspec( dllimport) diff --git a/EGkGeoObj.h b/EGkGeoObj.h index be5983b..9e7406f 100644 --- a/EGkGeoObj.h +++ b/EGkGeoObj.h @@ -21,7 +21,7 @@ //----------------------- Macro per import/export ---------------------------- #undef EGK_EXPORT -#ifdef I_AM_EGK // da definirsi solo nei moduli della DLL +#if defined( I_AM_EGK) // da definirsi solo nella DLL #define EGK_EXPORT __declspec( dllexport) #else #define EGK_EXPORT __declspec( dllimport) diff --git a/EGkGeoObjType.h b/EGkGeoObjType.h index b1c7da9..8bca78e 100644 --- a/EGkGeoObjType.h +++ b/EGkGeoObjType.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalS +// EgalTech 2013-2013 //---------------------------------------------------------------------------- -// File : GeoObjType.h Data : 30.04.13 Versione : 1.1d3 +// File : EGkGeoObjType.h Data : 21.11.13 Versione : 1.3a1 // Contenuto : Definizione Tipo degli Oggetti Geometrici. // // diff --git a/EGkPoint3d.h b/EGkPoint3d.h index 0f4aef0..803f59a 100644 --- a/EGkPoint3d.h +++ b/EGkPoint3d.h @@ -17,7 +17,7 @@ //----------------------- Macro per import/export ---------------------------- #undef EGK_EXPORT -#ifdef I_AM_EGK // da definirsi solo nei moduli della DLL +#if defined( I_AM_EGK) // da definirsi solo nella DLL #define EGK_EXPORT __declspec( dllexport) #else #define EGK_EXPORT __declspec( dllimport) diff --git a/EGkVector3d.h b/EGkVector3d.h index 9ff7ba9..687360b 100644 --- a/EGkVector3d.h +++ b/EGkVector3d.h @@ -17,7 +17,7 @@ //----------------------- Macro per import/export ----------------------------- #undef EGK_EXPORT -#ifdef I_AM_EGK // da definirsi solo nei moduli della DLL +#if defined( I_AM_EGK) // da definirsi solo nella DLL #define EGK_EXPORT __declspec( dllexport) #else #define EGK_EXPORT __declspec( dllimport) diff --git a/EGkVersion.h b/EGkVersion.h new file mode 100644 index 0000000..abed18b --- /dev/null +++ b/EGkVersion.h @@ -0,0 +1,27 @@ +//---------------------------------------------------------------------------- +// EgalTech 2013-2013 +//---------------------------------------------------------------------------- +// File : EgkVersion.h Data : 21.11.13 Versione : 1.3a1 +// Contenuto : Prototipo funzione con info versione della DLL. +// +// +// +// Modifiche : 21.11.13 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + + + +//----------------------- Macro per import/export ---------------------------- +#undef EGK_EXPORT +#if defined( I_AM_EGK) // da definirsi solo nella DLL + #define EGK_EXPORT __declspec( dllexport) +#else + #define EGK_EXPORT __declspec( dllimport) +#endif + +//----------------------------------------------------------------------------- +EGK_EXPORT const char* GetEGkVersion( void) ; diff --git a/EGnScan.h b/EGnScan.h index daafe01..5268b7f 100644 --- a/EGnScan.h +++ b/EGnScan.h @@ -18,7 +18,7 @@ //----------------------- Macro per import/export ----------------------------- #undef EGN_EXPORT -#ifdef I_AM_EGN // da definirsi solo nei moduli della DLL +#if defined( I_AM_EGN) // da definirsi solo nella DLL #define EGN_EXPORT __declspec( dllexport) #else #define EGN_EXPORT __declspec( dllimport) diff --git a/EGnStringConverter.h b/EGnStringConverter.h index 47dfcdd..7884cf4 100644 --- a/EGnStringConverter.h +++ b/EGnStringConverter.h @@ -53,7 +53,7 @@ inline void SmartFreeMemory( _CharType* pBuff, _CharType* pszFixedBuffer, int nF { if ( pBuff != pszFixedBuffer) free( pBuff) ; -#ifdef _DEBUG +#if defined( _DEBUG) else memset( pszFixedBuffer, 0xFE, nFixedBufferLength * sizeof(_CharType)) ; #endif diff --git a/EGnStringUtils.h b/EGnStringUtils.h index b23eab6..b82e151 100644 --- a/EGnStringUtils.h +++ b/EGnStringUtils.h @@ -20,7 +20,7 @@ //----------------------- Macro per import/export ----------------------------- #undef EGN_EXPORT -#ifdef I_AM_EGN // da definirsi solo nei moduli della DLL +#if defined( I_AM_EGN) // da definirsi solo nella DLL #define EGN_EXPORT __declspec( dllexport) #else #define EGN_EXPORT __declspec( dllimport) diff --git a/EGnVersion.h b/EGnVersion.h new file mode 100644 index 0000000..63782f5 --- /dev/null +++ b/EGnVersion.h @@ -0,0 +1,27 @@ +//---------------------------------------------------------------------------- +// EgalTech 2013-2013 +//---------------------------------------------------------------------------- +// File : EgnVersion.h Data : 21.11.13 Versione : 1.3a1 +// Contenuto : Prototipo funzione con info versione della DLL. +// +// +// +// Modifiche : 21.11.13 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + + + +//----------------------- Macro per import/export ---------------------------- +#undef EGN_EXPORT +#if defined( I_AM_EGN) // da definirsi solo nella DLL + #define EGN_EXPORT __declspec( dllexport) +#else + #define EGN_EXPORT __declspec( dllimport) +#endif + +//----------------------------------------------------------------------------- +EGN_EXPORT const char* GetEGnVersion( void) ; diff --git a/EgtLibVer.h b/EgtLibVer.h index c3ff954..8407a6f 100644 --- a/EgtLibVer.h +++ b/EgtLibVer.h @@ -17,7 +17,7 @@ #define EGTLIBDIR "/EgtDev/Lib/" // Dichiarazione suffisso librerie -#if _DEBUG +#if defined( _DEBUG) #define EGTLIBVER "D32" #else #define EGTLIBVER "R32" diff --git a/EgtTrace.h b/EgtTrace.h index 7221252..0794cad 100644 --- a/EgtTrace.h +++ b/EgtTrace.h @@ -16,7 +16,7 @@ #include -#ifdef _DEBUG +#if defined( _DEBUG) #define EGT_TRACE( sz) OutputDebugStringA( sz) #else #define EGT_TRACE( sz)