*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 938535897c8e0326edcd4b243bcc9ece9905761b..bddb6e75c104f1f0eb2cdcb849b08ba2778bc79d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VER
   CMAKE_POLICY(SET CMP0005 NEW)
 ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
 
-PROJECT(CreaMaracasVisu)
+PROJECT(creaMaracasVisu)
 
 SET(PROJECT_MAJOR_VERSION 1)
 SET(PROJECT_MINOR_VERSION 0)
@@ -44,3 +44,4 @@ MARK_AS_ADVANCED(
 #SUBDIRS(appli)
 SUBDIRS(lib)
 SUBDIRS(bbtk)
+SUBDIRS(install)

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 2f8323825a28ddf557ff23daf2c508c9fdc73b10..3ec066db35bb211e13d612ca9b24e85961a29371 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -209,7 +209,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
 
   # CREATE THE TARGET
-  ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES})
+  ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
 
   # LINK
   TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES})
@@ -271,7 +271,7 @@ INSTALL(
   ) 
 INSTALL(
   TARGETS ${LIBRARY_NAME}
-  DESTINATION lib)
+  DESTINATION bin )
 
   
   

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h
index 1f888d66d3d2016e959a5706bd8615237e40a8b6..68d6f4de25e8165f40a368e7f660f5182c5de17b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMPR.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/24 10:47:10 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -27,7 +27,7 @@
 #include "widgets/wxMPRWidget.h"
 
 
-class  MAR_INTERFACEWX_EXPORT  wxMaracasMPR : public wxPanel
+class  MARACASVISULIB_EXPORTS  wxMaracasMPR : public wxPanel
 {
 public:
     wxMaracasMPR( wxWindow* parent, marImageData* marimagedata,double voxelSize);

diff --git a/lib/maracasVisuLib/src/kernel/marDynData.h b/lib/maracasVisuLib/src/kernel/marDynData.h
index 0a20e9e55ebecfaeaa59424fb419fc8f4e647fa6..9c99585fbc458cbd2daad72a25861343d3a24829 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marDynData.h
+++ b/lib/maracasVisuLib/src/kernel/marDynData.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marDynData.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:55 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/24 10:47:12 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -24,7 +24,7 @@
 
 #include <vtkImageData.h>
 
-class MAR_KERNEL_EXPORT marDynData : public marObject
+class MARACASVISULIB_EXPORTS marDynData : public marObject
 {
 public:
 

diff --git a/lib/maracasVisuLib/src/kernel/marObject.h b/lib/maracasVisuLib/src/kernel/marObject.h
index 2d3217c447f39b71bc95d2cd313d12b566a0a80b..b01c5a1f5e3d5056b237e80d2890979929d9581b 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marObject.h
+++ b/lib/maracasVisuLib/src/kernel/marObject.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marObject.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/06 10:00:59 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/11/24 10:47:12 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -24,7 +24,7 @@
 /** /def marObject
  *  \brief General maracas object.
  */
-class MAR_KERNEL_EXPORT marObject
+class MARACASVISULIB_EXPORTS marObject
 {
     public:
 

diff --git a/lib/maracasVisuLib/src/kernel/marParameters.h b/lib/maracasVisuLib/src/kernel/marParameters.h
index 369eff346bff62c4d16445933943e1f3019680ca..5dbf07c2eb426ee3bcd8e72bf581e4dda5b4e737 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marParameters.h
+++ b/lib/maracasVisuLib/src/kernel/marParameters.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: marParameters.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:56 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/24 10:47:12 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -26,7 +26,7 @@
 /** /def marParameters
  *  \brief Parameters class definition.
  */
-class MAR_KERNEL_EXPORT marParameters
+class MARACASVISULIB_EXPORTS marParameters
 {
     public:
 

diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index e0e57dedf468f9951cfec0b357c60783d31ba5d5..887b2d7a321c438c513228358157a08ff3e8131c 100644 (file)
--- 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/24 10:47:12 $
+  Version:   $Revision: 1.4 $
 
   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"

diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx
index ed641d963a1e3eaf00149681e17bc3747333c045..5d29892cf6e14209f331ba256144ac6676270550 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/volume.hxx
+++ b/lib/maracasVisuLib/src/kernel/volume.hxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: volume.hxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:56 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/11/24 10:47:12 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -32,7 +32,7 @@ extern "C"
 #include <vtkImageData.h>
 #endif // KGFO_USE_VTK
 
-class MAR_KERNEL_EXPORT kVolume
+class MARACASVISULIB_EXPORTS kVolume
 {
     public: