From c7a5184a1f5b63cb8d3f3494472ea374d0a751f9 Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 28 Jan 2008 10:49:11 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/CMakeLists.txt | 2 ++ kernel/src/bbtkSystem.h | 18 +++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index 6182ac1..76e0550 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -148,6 +148,8 @@ ENDIF(NOT BBTK_INSTALL_NO_DEVELOPMENT) #----------------------------------------------------------------------------- # bbtk library creation #----------------------------------------------------------------------------- +# Symbols must be exported (Windows) +ADD_DEF(BBTK_EXPORT_SYMBOLS) #----------------------------------------------------------------------------- # Sources files diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h index 1047e7d..a65dd51 100644 --- a/kernel/src/bbtkSystem.h +++ b/kernel/src/bbtkSystem.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkSystem.h,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/01/28 10:49:11 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -77,8 +77,11 @@ // class ClassName -#if defined(_WIN32) && defined(BUILD_SHARED_LIBS) - #ifdef bbtk_EXPORTS2 +/* +// Useless ? +#if defined(_WIN32) +//&& defined(BUILD_SHARED_LIBS) + #ifdef BBTK_EXPORTS2 #define BBTK_EXPORT2 export #else #define BBTK_EXPORT2 @@ -86,13 +89,14 @@ #else #define BBTK_EXPORT2 #endif // defined(_WIN32) && defined(BUILD_SHARED_LIBS) +*/ - -#if defined(_WIN32) && defined(BUILD_SHARED_LIBS) +#if defined(_WIN32) +//&& defined(BUILD_SHARED_LIBS) //#include "WWW.h" - #ifdef bbtk_EXPORTS + #ifdef BBTK_EXPORT_SYMBOLS #define BBTK_EXPORT __declspec( dllexport ) #else #define BBTK_EXPORT __declspec( dllimport ) -- 2.45.1