X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarTypes.h;h=60a06f9e6bb4fa8bb86b53be4c9258191e1e14e0;hb=a3c5b7933550c47e3f68d0a40c6cd59aa398f200;hp=e0e57dedf468f9951cfec0b357c60783d31ba5d5;hpb=e59fe4a0a69ae0180c502e68c57faff544b935ca;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h index e0e57de..60a06f9 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/11/14 15:57:12 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/11/25 15:59:44 $ + Version: $Revision: 1.5 $ Copyright: (c) 2002, 2003 License: @@ -30,24 +30,25 @@ * this fairy tale :-). */ + //JHCL - Start //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 + #define MARACASVISULIB_EXPORTS #endif //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 ) @@ -65,6 +66,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"