diff options
Diffstat (limited to 'orkbasecxx')
-rw-r--r-- | orkbasecxx/AudioCapture.h | 2 | ||||
-rw-r--r-- | orkbasecxx/AudioCapturePlugin.h | 11 | ||||
-rw-r--r-- | orkbasecxx/Config.h | 2 | ||||
-rw-r--r-- | orkbasecxx/ConfigManager.h | 2 | ||||
-rw-r--r-- | orkbasecxx/LogManager.h | 3 | ||||
-rw-r--r-- | orkbasecxx/MultiThreadedServer.h | 2 | ||||
-rw-r--r-- | orkbasecxx/Object.h | 3 | ||||
-rw-r--r-- | orkbasecxx/OrkBase.dsp | 36 | ||||
-rw-r--r-- | orkbasecxx/OrkBase.h | 18 | ||||
-rw-r--r-- | orkbasecxx/Utils.h | 2 | ||||
-rw-r--r-- | orkbasecxx/dll.h | 10 | ||||
-rw-r--r-- | orkbasecxx/messages/Message.h | 2 | ||||
-rw-r--r-- | orkbasecxx/serializers/Serializer.h | 3 |
13 files changed, 69 insertions, 27 deletions
diff --git a/orkbasecxx/AudioCapture.h b/orkbasecxx/AudioCapture.h index d671145..8d5562d 100644 --- a/orkbasecxx/AudioCapture.h +++ b/orkbasecxx/AudioCapture.h @@ -16,7 +16,7 @@ #include "time.h" #include "StdString.h" -#include "OrkBase.h" +#include "dll.h" #include "boost/shared_ptr.hpp" diff --git a/orkbasecxx/AudioCapturePlugin.h b/orkbasecxx/AudioCapturePlugin.h index e52fe97..8162dc0 100644 --- a/orkbasecxx/AudioCapturePlugin.h +++ b/orkbasecxx/AudioCapturePlugin.h @@ -14,17 +14,18 @@ #ifndef __AUDIOCAPTUREPLUGIN_H__ #define __AUDIOCAPTUREPLUGIN_H__ +#include "dll.h" #include "AudioCapture.h" #include "LogManager.h" #include "xercesc/dom/DOMNode.hpp" using namespace XERCES_CPP_NAMESPACE; -#ifdef WIN32 -#define __CDECL__ __cdecl -#else -#define __CDECL__ -#endif +//#ifdef WIN32 +//#define __CDECL__ __cdecl +//#else +//#define __CDECL__ +//#endif #define AUDIO_CAPTURE_PLUGIN_INTERFACE_VERSION 1 diff --git a/orkbasecxx/Config.h b/orkbasecxx/Config.h index e910586..2587416 100644 --- a/orkbasecxx/Config.h +++ b/orkbasecxx/Config.h @@ -70,7 +70,7 @@ #define DELETE_FAILED_CAPTURE_FILE_PARAM "DeleteFailedCaptureFile" #define DELETE_FAILED_CAPTURE_FILE_DEFAULT false -class Config : public Object +class DLL_IMPORT_EXPORT Config : public Object { public: Config(); diff --git a/orkbasecxx/ConfigManager.h b/orkbasecxx/ConfigManager.h index a3eb42b..aeccf35 100644 --- a/orkbasecxx/ConfigManager.h +++ b/orkbasecxx/ConfigManager.h @@ -18,7 +18,7 @@ #include "Config.h" #include "AudioCapturePlugin.h" -class ConfigManager +class DLL_IMPORT_EXPORT ConfigManager { public: void Initialize(); diff --git a/orkbasecxx/LogManager.h b/orkbasecxx/LogManager.h index 70aadc1..e0887d8 100644 --- a/orkbasecxx/LogManager.h +++ b/orkbasecxx/LogManager.h @@ -16,11 +16,12 @@ #include <log4cxx/logger.h> #include "ace/Singleton.h" +#include "dll.h" using namespace log4cxx; -class OrkLogManager +class DLL_IMPORT_EXPORT OrkLogManager { public: void Initialize(); diff --git a/orkbasecxx/MultiThreadedServer.h b/orkbasecxx/MultiThreadedServer.h index b004007..8f9fcd1 100644 --- a/orkbasecxx/MultiThreadedServer.h +++ b/orkbasecxx/MultiThreadedServer.h @@ -19,7 +19,7 @@ #include <log4cxx/logger.h> -#include "OrkBase.h" +#include "dll.h" /** This server accepts permanent telnet like connections. commands are accepted in "single line" format. diff --git a/orkbasecxx/Object.h b/orkbasecxx/Object.h index ba8128e..eb61451 100644 --- a/orkbasecxx/Object.h +++ b/orkbasecxx/Object.h @@ -14,7 +14,8 @@ #ifndef __OBJECT_H__ #define __OBJECT_H__ -#include "OrkBase.h" +#include "dll.h" +#include "StdString.h" #include "boost/shared_ptr.hpp" #include "xercesc/dom/DOMNode.hpp" diff --git a/orkbasecxx/OrkBase.dsp b/orkbasecxx/OrkBase.dsp index 79a3091..cd6e2da 100644 --- a/orkbasecxx/OrkBase.dsp +++ b/orkbasecxx/OrkBase.dsp @@ -244,6 +244,30 @@ SOURCE=.\AudioCapture.h # End Source File # Begin Source File +SOURCE=.\AudioCapturePlugin.h +# End Source File +# Begin Source File + +SOURCE=.\Config.cpp +# End Source File +# Begin Source File + +SOURCE=.\Config.h +# End Source File +# Begin Source File + +SOURCE=.\ConfigManager.cpp +# End Source File +# Begin Source File + +SOURCE=.\ConfigManager.h +# End Source File +# Begin Source File + +SOURCE=.\dll.h +# End Source File +# Begin Source File + SOURCE=.\Filter.cpp # End Source File # Begin Source File @@ -260,6 +284,14 @@ SOURCE=.\g711.h # End Source File # Begin Source File +SOURCE=.\LogManager.cpp +# End Source File +# Begin Source File + +SOURCE=.\LogManager.h +# End Source File +# Begin Source File + SOURCE=.\MultiThreadedServer.cpp # End Source File # Begin Source File @@ -315,10 +347,6 @@ SOURCE=.\OrkBase.cpp # End Source File # Begin Source File -SOURCE=.\OrkBase.h -# End Source File -# Begin Source File - SOURCE=.\OrkClient.cpp # End Source File # Begin Source File diff --git a/orkbasecxx/OrkBase.h b/orkbasecxx/OrkBase.h index 95f1ef6..1a199c6 100644 --- a/orkbasecxx/OrkBase.h +++ b/orkbasecxx/OrkBase.h @@ -13,14 +13,14 @@ #define _WINSOCKAPI_ // prevents the inclusion of winsock.h -#ifdef WIN32 - #ifdef BUILD_ORKBASE - #define DLL_IMPORT_EXPORT __declspec( dllexport ) - #else - #define DLL_IMPORT_EXPORT __declspec( dllimport ) - #endif -#else - #define DLL_IMPORT_EXPORT -#endif +//#ifdef WIN32 +// #ifdef BUILD_ORKBASE +// #define DLL_IMPORT_EXPORT __declspec( dllexport ) +// #else +// #define DLL_IMPORT_EXPORT __declspec( dllimport ) +// #endif +//#else +// #define DLL_IMPORT_EXPORT +//#endif #include "StdString.h" diff --git a/orkbasecxx/Utils.h b/orkbasecxx/Utils.h index 7c14f28..691d330 100644 --- a/orkbasecxx/Utils.h +++ b/orkbasecxx/Utils.h @@ -23,7 +23,7 @@ #include "ace/OS_NS_time.h" #include "StdString.h" -#include "OrkBase.h" +#include "dll.h" //============================================ // String related stuff diff --git a/orkbasecxx/dll.h b/orkbasecxx/dll.h index 7dff4e9..5966e2b 100644 --- a/orkbasecxx/dll.h +++ b/orkbasecxx/dll.h @@ -2,6 +2,16 @@ #define __DLL_H__
#ifdef WIN32
+ #ifdef BUILD_ORKBASE
+ #define DLL_IMPORT_EXPORT __declspec( dllexport )
+ #else
+ #define DLL_IMPORT_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define DLL_IMPORT_EXPORT
+#endif
+
+#ifdef WIN32
#define __CDECL__ __cdecl
#else
#define __CDECL__
diff --git a/orkbasecxx/messages/Message.h b/orkbasecxx/messages/Message.h index ede5077..99ec887 100644 --- a/orkbasecxx/messages/Message.h +++ b/orkbasecxx/messages/Message.h @@ -19,7 +19,7 @@ #pragma warning( disable: 4018 ) // signed/unsigned mismatch //#endif -#include "OrkBase.h" +#include "dll.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_unistd.h" diff --git a/orkbasecxx/serializers/Serializer.h b/orkbasecxx/serializers/Serializer.h index a63af1a..d8f00cc 100644 --- a/orkbasecxx/serializers/Serializer.h +++ b/orkbasecxx/serializers/Serializer.h @@ -16,10 +16,11 @@ #pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning -#include "OrkBase.h" +#include "dll.h" #include <map> #include <list> #include "boost/shared_ptr.hpp" +#include "StdString.h" typedef int (*StringToEnumFunction)(CStdString&); typedef CStdString (*EnumToStringFunction)(int); |