[Gearbox-commit] SF.net SVN: gearbox:[438] gearbox/trunk/src/gbxutilacfr

[<gb...@us...>]

Revision: 438
          http://gearbox.svn.sourceforge.net/gearbox/?rev=438&view=rev
Author:   gbiggs
Date:     2009-08-28 01:57:20 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
Made GbxUtilAcfr usable on Windows

Modified Paths:
--------------
    gearbox/trunk/src/gbxutilacfr/CMakeLists.txt
    gearbox/trunk/src/gbxutilacfr/exceptions.h
    gearbox/trunk/src/gbxutilacfr/mathdefs.h
    gearbox/trunk/src/gbxutilacfr/status.h
    gearbox/trunk/src/gbxutilacfr/stoppable.h
    gearbox/trunk/src/gbxutilacfr/subhealth.h
    gearbox/trunk/src/gbxutilacfr/substatus.h
    gearbox/trunk/src/gbxutilacfr/tokenise.h
    gearbox/trunk/src/gbxutilacfr/tracer.h
    gearbox/trunk/src/gbxutilacfr/trivialstatus.h
    gearbox/trunk/src/gbxutilacfr/trivialtracer.h

Modified: gearbox/trunk/src/gbxutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxutilacfr/CMakeLists.txt	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/CMakeLists.txt	2009-08-28 01:57:20 UTC (rev 438)
@@ -6,7 +6,14 @@
 GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
 
 if( build )
-    
+    if (WIN32)
+        if (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+            add_definitions (-DGBXUTILACFR_EXPORTS)
+        else (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+            add_definitions (-DGBXUTILACFR_STATIC -DFLEXIPORT_STATIC)
+        endif (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+    endif (WIN32)
+
     include( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
 
     file( GLOB hdrs *.h )

Modified: gearbox/trunk/src/gbxutilacfr/exceptions.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/exceptions.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/exceptions.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_EXCEPTIONS_H
 #define GBXUTILACFR_EXCEPTIONS_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 /*
  * STRINGIZE macro converts an expression into a string-literal.
  * ERROR_INFO macro permits file-name and line-number data to be added to an error message.
@@ -50,7 +62,7 @@
 
 where the ERROR_INFO macro inserts the offending file and line number.
 */
-class Exception : public std::exception
+class GBXUTILACFR_EXPORT Exception : public std::exception
 {
 public:
     Exception(const char *file, const char *line, const std::string &message);
@@ -69,7 +81,7 @@
 };
 
 //! This exception is raised when something is wrong with the hardware.
-class HardwareException : public gbxutilacfr::Exception
+class GBXUTILACFR_EXPORT HardwareException : public gbxutilacfr::Exception
 {
 public:
     HardwareException(const char *file, const char *line, const std::string &message)

Modified: gearbox/trunk/src/gbxutilacfr/mathdefs.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/mathdefs.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/mathdefs.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -17,6 +17,18 @@
 #ifndef GBXUTILACFR_MATH_DEFINITIONS_H
 #define GBXUTILACFR_MATH_DEFINITIONS_H	
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <assert.h>
 
 /*****************************************************************************
@@ -66,7 +78,7 @@
 //dox Normalises the angle [rad] to the range [-pi,pi)
 //dox Don't return the normalised angle, because it's easy to make the
 //dox mistake of doing: 'NORMALISE_ANGLE( myAngle )', ignoring the return value.
-inline void NORMALISE_ANGLE( double &theta )
+GBXUTILACFR_EXPORT inline void NORMALISE_ANGLE( double &theta )
 {
     double multiplier;
 
@@ -84,7 +96,7 @@
 //dox Normalises the angle [rad] to the range [-pi,pi)
 //dox Don't return the normalised angle, because it's easy to make the
 //dox mistake of doing: 'NORMALISE_ANGLE( myAngle )', ignoring the return value.
-inline void NORMALISE_ANGLE( float &theta )
+GBXUTILACFR_EXPORT inline void NORMALISE_ANGLE( float &theta )
 {
     double thDouble = theta;
     NORMALISE_ANGLE( thDouble );
@@ -169,7 +181,7 @@
 //dox Modifies x to lie within [x_min,x_max]
 //dox
 template<typename T>
-void
+GBXUTILACFR_EXPORT void
 CLIP_TO_LIMITS( const T &min_x, T &x, const T &max_x )
 {
     assert( min_x <= max_x );

Modified: gearbox/trunk/src/gbxutilacfr/status.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/status.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/status.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_STATUS_H
 #define GBXUTILACFR_STATUS_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <string>
 #include <vector>
 
@@ -32,7 +44,7 @@
 };
 
 //! Returns string equivalent of state enumerator.
-std::string toString( SubsystemState state );
+GBXUTILACFR_EXPORT std::string toString( SubsystemState state );
 
 //! Possible subsystem status values
 enum SubsystemHealth
@@ -46,10 +58,10 @@
 };
 
 //! Returns string equivalent of health enumerator.
-std::string toString( SubsystemHealth health );
+GBXUTILACFR_EXPORT std::string toString( SubsystemHealth health );
 
 //! Status for a single subsystem
-struct SubsystemStatus
+struct GBXUTILACFR_EXPORT SubsystemStatus
 {
     //! Constructor.
     SubsystemStatus( SubsystemState s=SubsystemIdle, SubsystemHealth h=SubsystemOk, const std::string& msg="", 
@@ -80,7 +92,7 @@
 };
 
 //! Returns human-readable string with subsystem status information.
-std::string toString( const SubsystemStatus& status );
+GBXUTILACFR_EXPORT std::string toString( const SubsystemStatus& status );
 
 //! Subsystem type which describes common behavior models of a subsystem.
 enum SubsystemType {
@@ -91,7 +103,7 @@
 };
 
 //! Returns string equivalent of subsystem type enumerator.
-std::string toString( SubsystemType type );
+GBXUTILACFR_EXPORT std::string toString( SubsystemType type );
 
 /*!
 @brief Local interface to component status.
@@ -173,7 +185,7 @@
 @sa Tracer
 @sa SubStatus
 */
-class Status
+class GBXUTILACFR_EXPORT Status
 {
 
 public:

Modified: gearbox/trunk/src/gbxutilacfr/stoppable.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/stoppable.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/stoppable.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_STOPPABLE_H
 #define GBXUTILACFR_STOPPABLE_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 namespace gbxutilacfr {
 
 /*!
@@ -45,7 +57,7 @@
 
 @author Alex Makarenko
 */
-class Stoppable
+class GBXUTILACFR_EXPORT Stoppable
 {
 public:
     virtual ~Stoppable() {};

Modified: gearbox/trunk/src/gbxutilacfr/subhealth.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/subhealth.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/subhealth.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_SUBSYSTEM_HEALTH_H
 #define GBXUTILACFR_SUBSYSTEM_HEALTH_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <gbxutilacfr/status.h>
 
 namespace gbxutilacfr {
@@ -24,7 +36,7 @@
 //!
 //! @sa Status, SubsystemStatus
 //!
-class SubHealth
+class GBXUTILACFR_STATUS SubHealth
 {
 
 public:

Modified: gearbox/trunk/src/gbxutilacfr/substatus.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/substatus.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/substatus.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_SUBSYSTEM_STATUS_H
 #define GBXUTILACFR_SUBSYSTEM_STATUS_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <gbxutilacfr/status.h>
 
 namespace gbxutilacfr {
@@ -24,7 +36,7 @@
 //!
 //! @sa Status, @sa SubHealth
 //!
-class SubStatus
+class GBXUTILACFR_EXPORT SubStatus
 {
 
 public:

Modified: gearbox/trunk/src/gbxutilacfr/tokenise.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/tokenise.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/tokenise.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_TOKENISE_H
 #define GBXUTILACFR_TOKENISE_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <string>
 #include <vector>
 
@@ -18,8 +30,8 @@
 
 //! Takes a string containing tokens separated by a delimiter
 //! Returns the vector of tokens
-std::vector<std::string> tokenise( const std::string &str, 
-                                   const std::string &delimiter );
+GBXUTILACFR_EXPORT std::vector<std::string> tokenise( const std::string &str, 
+                                                      const std::string &delimiter );
 
 }
 

Modified: gearbox/trunk/src/gbxutilacfr/tracer.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/tracer.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/tracer.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_TRACER_H
 #define GBXUTILACFR_TRACER_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <string>
 
 namespace gbxutilacfr {
@@ -33,7 +45,7 @@
 };
 
 //! Returns a string corresponding to the enum element.
-std::string toString( TraceType type );
+GBXUTILACFR_EXPORT std::string toString( TraceType type );
 
 //! Types of destinations for traced information.
 enum DestinationType {
@@ -96,7 +108,7 @@
 //! 
 //! @see Status
 //!
-class Tracer
+class GBXUTILACFR_EXPORT Tracer
 {
 public:
     virtual ~Tracer() {}; 

Modified: gearbox/trunk/src/gbxutilacfr/trivialstatus.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/trivialstatus.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/trivialstatus.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_TRIVIAL_STATUS_H
 #define GBXUTILACFR_TRIVIAL_STATUS_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <gbxutilacfr/status.h>
 #include <gbxutilacfr/tracer.h>
 
@@ -24,7 +36,7 @@
 //!
 //! @see Status
 //!
-class TrivialStatus : public Status
+class GBXUTILACFR_EXPORT TrivialStatus : public Status
 {
 public:
 

Modified: gearbox/trunk/src/gbxutilacfr/trivialtracer.h
===================================================================
--- gearbox/trunk/src/gbxutilacfr/trivialtracer.h	2009-08-28 00:26:01 UTC (rev 437)
+++ gearbox/trunk/src/gbxutilacfr/trivialtracer.h	2009-08-28 01:57:20 UTC (rev 438)
@@ -11,6 +11,18 @@
 #ifndef GBXUTILACFR_TRIVIAL_TRACER_H
 #define GBXUTILACFR_TRIVIAL_TRACER_H
 
+#if defined (WIN32)
+    #if defined (GBXUTILACFR_STATIC)
+        #define GBXUTILACFR_EXPORT
+    #elif defined (GBXUTILACFR_EXPORTS)
+        #define GBXUTILACFR_EXPORT       __declspec (dllexport)
+    #else
+        #define GBXUTILACFR_EXPORT       __declspec (dllimport)
+    #endif
+#else
+    #define GBXUTILACFR_EXPORT
+#endif
+
 #include <gbxutilacfr/tracer.h>
 
 namespace gbxutilacfr {
@@ -20,7 +32,7 @@
 //!
 //! @see Tracer
 //!
-class TrivialTracer : public Tracer
+class GBXUTILACFR_EXPORT TrivialTracer : public Tracer
 {
 public:
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.