X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarTypes.h;h=baf1041a799e51354e5c889394a17ce8e5497b47;hb=096822cf3513065cfa25e378679339a5ae4684cf;hp=d119451a5bffeb7d7f23db9dd1dd30c8b590b2c2;hpb=440530af88d75f48ca2a77cfd3904c5d376e69a3;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index d119451..baf1041 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/05 15:27:03 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/05/14 13:54:43 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -30,24 +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 
+	#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 )
@@ -65,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"
@@ -82,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