Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add DLL_STATIC flags.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 21 Jun 2010 14:08:20 +0000 (14:08 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 21 Jun 2010 14:08:20 +0000 (14:08 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7913 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/Cmake/gras_config.h.in
include/simgrid_config.h.in

index 1809e5f..15a1e35 100644 (file)
@@ -6,7 +6,11 @@
 #ifdef _XBT_DLL_EXPORT
        #define DLL_EXPORT
 #else
 #ifdef _XBT_DLL_EXPORT
        #define DLL_EXPORT
 #else
-       #define DLL_IMPORT
+       #ifdef _XBT_DLL_STATIC
+               #define DLL_STATIC
+       #else
+               #define DLL_IMPORT
+       #endif
 #endif
 
 #ifndef __STRICT_ANSI__
 #endif
 
 #ifndef __STRICT_ANSI__
index a1baeee..0eb76a2 100644 (file)
 #ifdef _XBT_DLL_EXPORT
        #define DLL_EXPORT
 #else
 #ifdef _XBT_DLL_EXPORT
        #define DLL_EXPORT
 #else
-       #define DLL_IMPORT
+       #ifdef _XBT_DLL_STATIC
+               #define DLL_STATIC
+       #else
+               #define DLL_IMPORT
+       #endif
 #endif
 
 #cmakedefine _XBT_WIN32 @_XBT_WIN32@   //this variable is set if it is a windows platform
 #endif
 
 #cmakedefine _XBT_WIN32 @_XBT_WIN32@   //this variable is set if it is a windows platform