more splitting into libcrawl, crawl binary

moved more public header to 'include'
changed approach for dynamic linking on Windows

5 files changed, 32 insertions, 40 deletions

diff --git a/include/util/Exportable.hpp b/include/util/Exportable.hpp
deleted file mode 100755
index fc8269f..0000000
--- a/include/util/Exportable.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __EXPORTABLE_H
-#define __EXPORTABLE_H
-
-#ifndef _WIN32
-
-#define DLL_VISIBLE
-#define DLL_EXTERN
-
-#else
-
-#ifdef NODLL
-#define DLL_VISIBLE
-#define DLL_EXTERN
-#else
-#ifdef SHARED
-#define DLL_VISIBLE __declspec(dllexport)
-#define DLL_EXTERN
-#else
-#define DLL_VISIBLE __declspec(dllimport)
-#define DLL_EXTERN
-#endif
-#endif
-
-#endif // _WIN32
-
-#endif
diff --git a/include/util/NonCopyable.hpp b/include/util/NonCopyable.hpp
index 99804d2..22fdaf9 100755
--- a/include/util/NonCopyable.hpp
+++ b/include/util/NonCopyable.hpp
@@ -1,12 +1,12 @@
 #ifndef __NONCOPYABLE_H
 #define __NONCOPYABLE_H
 
-#include "Exportable.hpp"
+#include "UtilExportable.hpp"
 
 namespace __dont_touch
 {
 
-class DLL_VISIBLE noncopyable
+class UTIL_DLL_VISIBLE noncopyable
 {
 	protected:
 		noncopyable( ) { }
diff --git a/include/util/ScopedPtr.hpp b/include/util/ScopedPtr.hpp
index 991409d..5fdd1f2 100755
--- a/include/util/ScopedPtr.hpp
+++ b/include/util/ScopedPtr.hpp
@@ -2,9 +2,10 @@
 #define __SCOPEDPTR_H
 
 #include "NonCopyable.hpp"
+#include "UtilExportable.hpp"
 
 template< typename T >
-class DLL_VISIBLE scopedPtr : private noncopyable
+class UTIL_DLL_VISIBLE scopedPtr : private noncopyable
 {
 	public:
 		explicit scopedPtr( T *p = 0 ) : m_p( p ) { }
diff --git a/include/util/Singleton.hpp b/include/util/Singleton.hpp
index f291435..80ab5e8 100755
--- a/include/util/Singleton.hpp
+++ b/include/util/Singleton.hpp
@@ -3,7 +3,7 @@
 
 #include "ScopedPtr.hpp"
 #include "NonCopyable.hpp"
-#include "Exportable.hpp"
+#include "UtilExportable.hpp"
 #include "Noreturn.hpp"
 
 #include <cstdlib>
@@ -13,20 +13,11 @@
 	friend class Singleton< T >; \
 	friend class scopedPtr< T >;
 	
-#define DEFINE_SINGLETON( T )
-
-#if 0
-#define DECLARE_SINGLETON( T ) \
-
-#define DEFINE_SINGLETON( T ) \
-	DLL_EXTERN template class DLL_VISIBLE Singleton< T >; 
-#endif
-
 template< class T >
 class Singleton : private noncopyable
 {
 	public:
-		DLL_VISIBLE static T& instance( )
+		UTIL_DLL_VISIBLE static T& instance( )
 		{
 			if( destroyed ) {
 				onDeadReference( );
diff --git a/include/util/UtilExportable.hpp b/include/util/UtilExportable.hpp
new file mode 100755
index 0000000..f9598f1
--- /dev/null
+++ b/include/util/UtilExportable.hpp
@@ -0,0 +1,26 @@
+#ifndef __UTIL_EXPORTABLE_H
+#define __UTIL_EXPORTABLE_H
+
+#ifndef _WIN32
+
+#define UTIL_DLL_VISIBLE
+
+#else
+
+#ifdef SHARED
+
+#ifdef BUILDING_UTIL
+#define UTIL_DLL_VISIBLE __declspec(dllexport)
+#else
+#define UTIL_DLL_VISIBLE __declspec(dllimport)
+#endif
+
+#else
+
+#define UTIL_DLL_VISIBLE
+
+#endif
+
+#endif
+
+#endif