X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarTypes.h;h=1fbead0aef0ac313cf93d2ab0a4b7937269df823;hb=3e48d6cf83c4d96585d3e825899db643f9a62193;hp=998e7c9cb45cdb09b01c9d468ca07b3dcef0f924;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h index 998e7c9..1fbead0 100644 --- a/lib/maracasVisuLib/src/kernel/marTypes.h +++ b/lib/maracasVisuLib/src/kernel/marTypes.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marTypes.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:56 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/01/15 11:09:47 $ + Version: $Revision: 1.6 $ Copyright: (c) 2002, 2003 License: @@ -30,22 +30,29 @@ * this fairy tale :-). */ + //JHCL - Start -//If we're using windws +//If we're using windows +/* #if defined(WIN32) -//If we're using a dynamic library -# ifdef maracasVisuLib_BUILD_SHARED -# define MARACASVISULIB_EXPORTS __declspec( dllexport ) -# else -# define MARACASVISULIB_EXPORTS //__declspec( dllimport ) -# endif //maracasvisulib_EXPORTS + //If we're using a dynamic library + #ifdef creaMaracasVisu_BUILD_SHARED + #define MARACASVISULIB_EXPORTS __declspec( dllexport ) + #else + #define MARACASVISULIB_EXPORTS __declspec( dllimport ) + #endif //maracasvisulib_EXPORTS +#else + #define MARACASVISULIB_EXPORTS #endif + */ +// LG 15/01/09 : Now use crea mechanism +#include "creaMaracasVisu_EXPORT.h" //JHCL - End + +/* #if defined(WIN32) //&& defined(MARACAS_BUILD_SHARED_LIBS) -//guerapa0 # ifdef MaracasKernel_EXPORTS -//querapa1 # define MAR_KERNEL_EXPORT __declspec( dllexport ) # else # define MAR_KERNEL_EXPORT //__declspec( dllimport ) @@ -63,6 +70,8 @@ # define MAR_INTERFACEWX_EXPORT #endif //WIN32 +*/ + // Other ridiculous constants and typedefs. Just for fun! #define MAR_DEFAULT_FILE_PARAMETERS "params.dat" #define MAR_DEFAULT_FILE_DICTIONARY "marDict.txt" @@ -80,7 +89,8 @@ typedef unsigned long ulong; /*!< unsigned long redefintion. */ typedef unsigned short ushort; /*!< unsigned short redefintion. */ // Is this compilation using LibIDO? -#define KGFO_USE_IDO + +//#define KGFO_USE_IDO // JPRx : Do NOT use LibIDO // Is this compilation using VTK? #define KGFO_USE_VTK