Fuck it. Screw the dll for now, we'll just use a static lib until someone who knows what they're doing can fix it

src/core/Crypt.h

@@ -43,7 +43,7 @@ namespace musik{ namespace core{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT Crypt{
+class  Crypt{
     public:
         static std::string GenerateSalt();
         static std::string StaticSalt();

src/core/IPlugin.h

@@ -39,7 +39,7 @@
 
 
 namespace musik{ namespace core{
-    class MUSIK_EXPORT IPlugin{
+    class  IPlugin{
         protected:             
             virtual ~IPlugin() {};
         public:

src/core/ITrack.h

@@ -46,7 +46,7 @@ namespace musik{ namespace core{
 ///\brief
 ///The virtual base for all tracks
 //////////////////////////////////////////
-class MUSIK_EXPORT ITrack {
+class  ITrack {
     public:
         virtual ~ITrack(){};
         virtual const utfchar* GetValue(const char* metakey) = 0;

src/core/Image.h

@@ -45,7 +45,7 @@ namespace musik{ namespace core{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT Image{
+class  Image{
     public:
         Image(void);
         ~Image(void);

src/core/Indexer.h

@@ -65,7 +65,7 @@ namespace musik{ namespace core{
 ///but can also be used as a standalone class for indexing files.
 ///All you need to do is create a Indexer object and call Startup()
 //////////////////////////////////////////
-class MUSIK_EXPORT Indexer : public ThreadHelper,private boost::noncopyable {
+class  Indexer : public ThreadHelper,private boost::noncopyable {
     public:
         Indexer(void);
         ~Indexer(void);

src/core/IndexerTrack.h

@@ -53,7 +53,7 @@ namespace musik{ namespace core{
 ///\brief
 ///A LibraryTrack is a track related to a Library.
 //////////////////////////////////////////
-class MUSIK_EXPORT IndexerTrack : public Track {
+class  IndexerTrack : public Track {
     public:
         IndexerTrack(DBINT id);
         virtual ~IndexerTrack(void);

src/core/Library/Base.h

@@ -42,14 +42,14 @@
 //////////////////////////////////////////////////////////////////////////////
 // Forward declare
 namespace musik{ namespace core{
-    class MUSIK_EXPORT Indexer;
+    class  Indexer;
 
     namespace Query{
-        class MUSIK_EXPORT Base;
+        class  Base;
         typedef boost::shared_ptr<musik::core::Query::Base> Ptr;
     }
     namespace Library{
-        class MUSIK_EXPORT Base;
+        class  Base;
     }
 	typedef boost::shared_ptr<Library::Base> LibraryPtr;
 	typedef boost::weak_ptr<Library::Base> LibraryWeakPtr;
@@ -88,7 +88,7 @@ namespace musik{ namespace core{ namespace Library{
 ///\see
 ///musik::core::Library::LocalDB
 //////////////////////////////////////////
-class MUSIK_EXPORT Base : boost::noncopyable{
+class  Base : boost::noncopyable{
     protected:
         Base(utfstring name,int id);
 	public:

src/core/Library/LocalDB.h

@@ -40,7 +40,7 @@
 // Forward declare
 namespace musik{ namespace core{
     namespace Query{
-        class MUSIK_EXPORT Base;
+        class  Base;
     }
 } }
 //////////////////////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@ namespace musik{ namespace core{ namespace Library{
 ///\see
 ///Indexer
 //////////////////////////////////////////
-class MUSIK_EXPORT LocalDB : public Library::Base{
+class  LocalDB : public Library::Base{
 	private:
         LocalDB(utfstring name,int id);
     public:

src/core/Library/Remote.h

@@ -38,7 +38,7 @@
 
 namespace musik{ namespace core{
     namespace Query{
-        class MUSIK_EXPORT Base;
+        class  Base;
     }
 } }
 
@@ -57,7 +57,7 @@ namespace musik{ namespace core{ namespace Library{
 ///\brief
 ///Library used for your remote music.
 //////////////////////////////////////////
-class MUSIK_EXPORT Remote : public Library::Base{
+class  Remote : public Library::Base{
 	private:
         Remote(utfstring name,int id);
     public:

src/core/LibraryFactory.h

@@ -55,7 +55,7 @@ namespace musik{ namespace core{
 ///When the LibraryFactory is first initialized it will load all
 ///libraries from the settings.db database.
 //////////////////////////////////////////
-class MUSIK_EXPORT LibraryFactory{
+class  LibraryFactory{
     private:
 //        static LibraryFactory sInstance;
     public:

src/core/MessageQueue.h

@@ -57,9 +57,9 @@ class MessageQueue {
         typedef sigslot::signal2<const char*,void*> ControllerEventSignal;
         typedef sigslot::signal1<void*> EventSignal;
 
-        static MUSIK_EXPORT ControllerEventSignal& EventController();
-        static MUSIK_EXPORT EventSignal& MessageEvent(const char* identifier);
-        static void MUSIK_EXPORT SendMessage(const char* identifier,void* data=NULL);
+        static  ControllerEventSignal& EventController();
+        static  EventSignal& MessageEvent(const char* identifier);
+        static void  SendMessage(const char* identifier,void* data=NULL);
 
 
     private:

src/core/MetaKey.h

@@ -43,7 +43,7 @@ namespace musik{ namespace core{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT MetaKey{
+class  MetaKey{
     private:
         MetaKey(void);
         ~MetaKey(void);

src/core/MetadataValue.h

@@ -44,7 +44,7 @@
 #include <vector>
 
 namespace musik{ namespace core{
-    class MUSIK_EXPORT MetadataValue{
+    class  MetadataValue{
         public:
             MetadataValue(void);
             MetadataValue(const DBINT newId,const utfchar *value);

src/core/NonLibraryTrackHelper.h

@@ -53,7 +53,7 @@ namespace musik{ namespace core{
 
 class NonLibraryTrackHelper{
     public:
-        static MUSIK_EXPORT NonLibraryTrackHelper& Instance();
+        static  NonLibraryTrackHelper& Instance();
         static boost::mutex& TrackMutex();
 
         void ReadTrack(musik::core::TrackPtr track);

src/core/PlaybackQueue.h

@@ -85,7 +85,7 @@ class PlaybackQueue : public sigslot::has_slots<>{
         ///\brief
         ///Access to the PlaybackQueue singleton
         //////////////////////////////////////////
-        static MUSIK_EXPORT PlaybackQueue& Instance(){ return sInstance; };
+        static  PlaybackQueue& Instance(){ return sInstance; };
 
         //////////////////////////////////////////
         ///\brief

src/core/Plugin/IMetaDataReader.h

@@ -40,7 +40,7 @@
 #include <core/ITrack.h>
 
 namespace musik{ namespace core{ namespace Plugin{
-    class MUSIK_EXPORT IMetaDataReader{
+    class  IMetaDataReader{
         public:
             virtual bool ReadTag(musik::core::ITrack *track)=0;
             virtual bool CanReadTag(const utfchar *extension)=0;

src/core/PluginFactory.h

@@ -54,7 +54,7 @@ namespace musik{ namespace core{
     class PluginFactory{
         public:
 
-        static MUSIK_EXPORT PluginFactory& Instance() {
+        static  PluginFactory& Instance() {
             return sInstance;
         }
 
@@ -82,14 +82,14 @@ namespace musik{ namespace core{
         public:
 
             template <typename T>
-            class MUSIK_EXPORT DestroyDeleter {
+            class  DestroyDeleter {
             public: void operator()(T* t) {
                     t->Destroy();
                 }
             };
 
             template <typename T>
-            class MUSIK_EXPORT NullDeleter {
+            class  NullDeleter {
             public: void operator()(T* t) {
                 }
             };

src/core/Preferences.h

@@ -49,7 +49,7 @@ namespace musik{ namespace core{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT Preferences{
+class  Preferences{
     public:
         Preferences(const char* nameSpace,const utfchar* library=NULL);
         ~Preferences(void);

src/core/Query/Base.h

@@ -43,16 +43,16 @@ namespace musik{ namespace core{
         class Connection;
     }
     namespace Library{
-        class MUSIK_EXPORT Base;
-        class MUSIK_EXPORT LocalDB;
-        class MUSIK_EXPORT Remote;
+        class  Base;
+        class  LocalDB;
+        class  Remote;
     }
     namespace server{
         class Connection;
     }
     namespace xml{
-        class MUSIK_EXPORT ParserNode;
-        class MUSIK_EXPORT WriterNode;
+        class  ParserNode;
+        class  WriterNode;
     }
 } }
 //////////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ namespace musik{ namespace core{
 namespace musik{ namespace core{ namespace Query{
 
 //////////////////////////////////////////////////////////////////////////////
-class MUSIK_EXPORT Base;
+class  Base;
 typedef boost::shared_ptr<Query::Base> Ptr;
 
 typedef enum{
@@ -84,7 +84,7 @@ typedef enum{
 ///\brief
 ///Interface class for all queries.
 //////////////////////////////////////////
-class MUSIK_EXPORT Base : public sigslot::has_slots<> {
+class  Base : public sigslot::has_slots<> {
     public:
         Base(void);
         virtual ~Base(void);

src/core/Query/Factory.h

@@ -48,7 +48,7 @@ namespace musik{ namespace core{ namespace Query{
 
 typedef std::map<std::string,musik::core::Query::Ptr> QueryMap;
 
-class MUSIK_EXPORT Factory{
+class  Factory{
 
     private:
         Factory(void);

src/core/Query/ListBase.h

@@ -55,7 +55,7 @@
 namespace musik{ namespace core{
 
     namespace Query{
-        class MUSIK_EXPORT ListBase : public Query::Base {
+        class  ListBase : public Query::Base {
             public:
                 ListBase(void);
                 virtual ~ListBase(void);

src/core/Query/ListSelection.h

@@ -65,7 +65,7 @@ namespace musik{ namespace core{ namespace Query{
 ///\see
 ///Query::ListBase
 //////////////////////////////////////////
-class MUSIK_EXPORT ListSelection : public Query::ListBase{
+class  ListSelection : public Query::ListBase{
     public:
         ListSelection(void);
         ~ListSelection(void);

src/core/Query/PlaylistLoad.h

@@ -51,7 +51,7 @@
 //////////////////////////////////////////////////////////////
 namespace musik{ namespace core{
     namespace Library{
-        class MUSIK_EXPORT Base;
+        class  Base;
     }
 } }
 
@@ -59,7 +59,7 @@ namespace musik{ namespace core{
 namespace musik{ namespace core{
     namespace Query{
 
-        class MUSIK_EXPORT PlaylistLoad : public Query::ListBase{
+        class  PlaylistLoad : public Query::ListBase{
             public:
                 PlaylistLoad(void);
                 ~PlaylistLoad(void);

src/core/Query/PlaylistSave.h

@@ -51,7 +51,7 @@
 //////////////////////////////////////////////////////////////
 namespace musik{ namespace core{
     namespace Library{
-        class MUSIK_EXPORT Base;
+        class  Base;
     }
 } }
 
@@ -59,7 +59,7 @@ namespace musik{ namespace core{
 namespace musik{ namespace core{
     namespace Query{
 
-        class MUSIK_EXPORT PlaylistSave : public Query::Base{
+        class  PlaylistSave : public Query::Base{
             public:
                 PlaylistSave(void);
                 ~PlaylistSave(void);

src/core/Query/Playlists.h

@@ -41,7 +41,7 @@
 //////////////////////////////////////////////////////////////
 namespace musik{ namespace core{
     namespace Library{
-        class MUSIK_EXPORT Base;
+        class  Base;
     }
 } }
 
@@ -62,7 +62,7 @@ namespace musik{ namespace core{ namespace Query{
 
 //////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT Playlists : public Query::Base{
+class  Playlists : public Query::Base{
     public:
         Playlists(void);
         ~Playlists(void);

src/core/Query/SortTracks.h

@@ -52,7 +52,7 @@
 namespace musik{ namespace core{
     namespace Query{
 
-        class MUSIK_EXPORT SortTracks : public Query::ListBase{
+        class  SortTracks : public Query::ListBase{
             public:
                 SortTracks(void);
                 ~SortTracks(void);

src/core/Query/SortTracksWithData.h

@@ -61,7 +61,7 @@ namespace musik{ namespace core{ namespace Query{
 ///\see
 ///musik::core::Query::SortTracks
 //////////////////////////////////////////
-class MUSIK_EXPORT SortTracksWithData : public Query::Base{
+class  SortTracksWithData : public Query::Base{
     public:
         SortTracksWithData(void);
         ~SortTracksWithData(void);

src/core/Query/TrackMetadata.h

@@ -54,10 +54,10 @@ namespace musik{ namespace core{ namespace Query{
 
 //////////////////////////////////////////////////////////////////////////////
 // Forward declaration
-class MUSIK_EXPORT Base;
+class  Base;
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT TrackMetadata : public Query::Base {
+class  TrackMetadata : public Query::Base {
     public:
         TrackMetadata(void);
         ~TrackMetadata(void);

src/core/Server.h

@@ -69,7 +69,7 @@ namespace musik{ namespace core{
 ///\see
 ///Indexer | http::Server | server::Connection
 //////////////////////////////////////////
-class MUSIK_EXPORT Server{
+class  Server{
     public:
         // Methods
         Server(unsigned int port,unsigned int httpPort);

src/core/ThreadHelper.h

@@ -43,7 +43,7 @@
 
 
 namespace musik{ namespace core{
-    class MUSIK_EXPORT ThreadHelper{
+    class  ThreadHelper{
         public:
             ThreadHelper(void);
             virtual ~ThreadHelper(void);

src/core/Track.h

@@ -45,10 +45,10 @@
 // Forward declare
 namespace musik{ namespace core{
     namespace Library{
-        class MUSIK_EXPORT Base;
+        class  Base;
     }
 	typedef boost::shared_ptr<Library::Base> LibraryPtr;
-    class MUSIK_EXPORT Track;
+    class  Track;
     typedef boost::shared_ptr<Track> TrackPtr;
     typedef std::vector<TrackPtr> TrackVector;
 } }
@@ -63,7 +63,7 @@ namespace musik{ namespace core{
 ///\brief
 ///The most basic implementation of a track
 //////////////////////////////////////////
-class MUSIK_EXPORT Track : public ITrack {
+class  Track : public ITrack {
     public:
         virtual ~Track();
         virtual DBINT Id();

src/core/TrackFactory.h

@@ -47,7 +47,7 @@ namespace musik{ namespace core{
 ///\brief
 ///The TrackFactory helps to create tracks from a uri
 //////////////////////////////////////////
-class MUSIK_EXPORT TrackFactory{
+class  TrackFactory{
     public:
         static TrackPtr CreateTrack(utfstring uri);
 };

src/core/Version.h

@@ -41,7 +41,7 @@
 #include <string>
 
 namespace musik{ namespace core{
-    class MUSIK_EXPORT Version{
+    class  Version{
         public:
             Version(void);
             Version(VERSION iMajor,VERSION iMinor,VERSION iRevision,VERSION iBuild);

src/core/audio/Buffer.h

@@ -41,8 +41,8 @@ namespace musik { namespace core { namespace audio {
 //////////////////////////////////////////////////////////////////////////////
 
 // Forward
-class MUSIK_EXPORT Buffer;
-class MUSIK_EXPORT Stream;
+class  Buffer;
+class  Stream;
 typedef boost::shared_ptr<Buffer> BufferPtr;
 
 
@@ -51,7 +51,7 @@ typedef boost::shared_ptr<Buffer> BufferPtr;
 ///Buffer is the ony implementation of the IBuffer and is used 
 ///in the audioengine to pass along the raw audio data
 //////////////////////////////////////////
-class MUSIK_EXPORT Buffer : public IBuffer {
+class  Buffer : public IBuffer {
     public:
         static BufferPtr Create();
     private:

src/core/audio/IAnalyzer.h

@@ -52,7 +52,7 @@ namespace musik { namespace core { namespace audio {
 ///returns false). Finally the End method will be called where the
 ///the plugin can make changes to the tracks metadata.
 //////////////////////////////////////////
-class MUSIK_EXPORT IAnalyzer {
+class  IAnalyzer {
     public:
         //////////////////////////////////////////
         ///\brief

src/core/audio/IBuffer.h

@@ -38,7 +38,7 @@
 namespace musik { namespace core { namespace audio {
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IBuffer {
+class  IBuffer {
     public:
 
         //////////////////////////////////////////

src/core/audio/IDSP.h

@@ -44,7 +44,7 @@ namespace musik { namespace core { namespace audio {
 ///Main interface for dsp plugins.
 ///Each instance equals a track.
 //////////////////////////////////////////
-class MUSIK_EXPORT IDSP {
+class  IDSP {
     public:
         //////////////////////////////////////////
         ///\brief

src/core/audio/IDecoder.h

@@ -40,7 +40,7 @@
 namespace musik { namespace core { namespace audio {
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IDecoder{
+class  IDecoder{
 
     public:
 

src/core/audio/IDecoderFactory.h

@@ -44,7 +44,7 @@ namespace musik { namespace core { namespace audio {
 ///Interface for decoder plugins to be able to create
 ///instances of IDecoder
 //////////////////////////////////////////
-class MUSIK_EXPORT IDecoderFactory{
+class  IDecoderFactory{
     public: 
         //////////////////////////////////////////
         ///\brief

src/core/audio/IOutput.h

@@ -41,7 +41,7 @@
 namespace musik { namespace core { namespace audio {
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IOutput{
+class  IOutput{
 
     public:    
 

src/core/audio/IPlayer.h

@@ -43,7 +43,7 @@ namespace musik { namespace core { namespace audio {
 ///\brief
 ///Interface for the audio::Player to make IOuput plugins be able to make callbacks
 //////////////////////////////////////////
-class MUSIK_EXPORT IPlayer{
+class  IPlayer{
     public:
         //////////////////////////////////////////
         ///\brief

src/core/audio/Player.h

@@ -48,12 +48,12 @@ namespace musik { namespace core { namespace audio {
 //////////////////////////////////////////////////////////////////////////////
 
 // Forward declare
-class MUSIK_EXPORT Player;
-class MUSIK_EXPORT Transport;
+class  Player;
+class  Transport;
 typedef boost::shared_ptr<Player> PlayerPtr;
 
 //////////////////////////////////////////////////////////////////////////////
-class MUSIK_EXPORT Player : public IPlayer {
+class  Player : public IPlayer {
     public:
         typedef boost::shared_ptr<IOutput> OutputPtr;
 

src/core/audio/Stream.h

@@ -48,12 +48,12 @@ namespace musik { namespace core { namespace audio {
 //////////////////////////////////////////////////////////////////////////////
 
 // Forward declare
-class MUSIK_EXPORT Stream;
-class MUSIK_EXPORT Player;
+class  Stream;
+class  Player;
 typedef boost::shared_ptr<Stream> StreamPtr;
 
 //////////////////////////////////////////////////////////////////////////////
-class MUSIK_EXPORT Stream {
+class  Stream {
     public:
         static StreamPtr Create(unsigned int options=0);
 

src/core/audio/Transport.h

@@ -45,7 +45,7 @@ namespace musik { namespace core { namespace audio {
 /**
  *	Interface between application and Player objects
  */
-class MUSIK_EXPORT Transport : public sigslot::has_slots<>{
+class  Transport : public sigslot::has_slots<>{
     public:
         Transport();
         ~Transport();

src/core/config.h

@@ -47,12 +47,7 @@
     #include <tchar.h>
 
 	#include "musik_dll_exports.h"
-    /*#ifndef MUSIKCOREIMPORT
-        //#define DLLEXPORT __declspec( dllexport )
-        #define DLLEXPORT
-    #else
-        #define DLLEXPORT __declspec( dllimport )
-    #endif*/
+
     typedef unsigned __int64 UINT64;
 
     #define STDCALL(fp) (__stdcall* fp)()

src/core/db/CachedStatement.h

@@ -42,7 +42,7 @@
 namespace musik{ namespace core{ namespace db{
     
     // Forward declare
-    class MUSIK_EXPORT Statement;
+    class  Statement;
 
     //////////////////////////////////////////
     ///\brief
@@ -60,7 +60,7 @@ namespace musik{ namespace core{ namespace db{
     ///\see
     ///musik::core::db::Statement
     //////////////////////////////////////////
-    class MUSIK_EXPORT CachedStatement : public Statement{
+    class  CachedStatement : public Statement{
         public: 
             CachedStatement(const char* sql,Connection &connection);
             ~CachedStatement();

src/core/db/ScopedTransaction.h

@@ -61,7 +61,7 @@ namespace musik{ namespace core{ namespace db{
     ///\remarks
     ///Nested transations are partially supported. First scope is the one deciding when transaction is commited.
     //////////////////////////////////////////
-    class MUSIK_EXPORT ScopedTransaction : boost::noncopyable{
+    class  ScopedTransaction : boost::noncopyable{
         public: 
             ScopedTransaction(Connection &connection);
             ~ScopedTransaction();

src/core/db/Statement.h

@@ -50,14 +50,14 @@ struct sqlite3_stmt;
 namespace musik{ namespace core{ namespace db{
 
     class Connection;
-    class MUSIK_EXPORT CachedStatement;
+    class  CachedStatement;
 
 
     //////////////////////////////////////////
     ///\brief
     ///Class for precompiling SQL statements
     //////////////////////////////////////////
-    class MUSIK_EXPORT Statement : boost::noncopyable{
+    class  Statement : boost::noncopyable{
         public: 
             Statement(const char* sql,Connection &connection);
             virtual ~Statement();

src/core/filestreams/Factory.h

@@ -56,8 +56,8 @@ class Factory {
         FileStreamFactoryVector fileStreamFactories;
 
     public:
-        static FileStreamPtr MUSIK_EXPORT OpenFile(const utfchar *uri);
-        static bool MUSIK_EXPORT IsLocalFileStream(const utfchar *uri);
+        static FileStreamPtr  OpenFile(const utfchar *uri);
+        static bool  IsLocalFileStream(const utfchar *uri);
 };
 
 //////////////////////////////////////////////////////////////////////////////

src/core/filestreams/IFileStream.h

@@ -49,7 +49,7 @@ namespace musik{ namespace core{ namespace filestreams{
 
 typedef long PositionType;
 
-class MUSIK_EXPORT IFileStream{
+class  IFileStream{
     public:
 
 

src/core/filestreams/IFileStreamFactory.h

@@ -43,7 +43,7 @@
 namespace musik{ namespace core{ namespace filestreams{
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IFileStreamFactory{
+class  IFileStreamFactory{
     public:
 
         //////////////////////////////////////////

src/core/filestreams/LocalFileStream.h

@@ -46,7 +46,7 @@
 namespace musik{ namespace core{ namespace filestreams{
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT LocalFileStream : public IFileStream{
+class  LocalFileStream : public IFileStream{
     public:
         LocalFileStream();
         ~LocalFileStream();

src/core/http/IRequestParser.h

@@ -44,7 +44,7 @@ namespace musik{ namespace core{ namespace http{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IRequestParser{
+class  IRequestParser{
     public:
         virtual const char* Attribute(const char* key)=0;
         virtual const char* Path()=0;

src/core/http/IRequestPlugin.h

@@ -47,7 +47,7 @@ namespace musik{ namespace core{ namespace http{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IRequestPlugin{
+class  IRequestPlugin{
     public:
         virtual void Destroy()=0;
         virtual const char* WatchPath()=0;

src/core/http/IResponder.h

@@ -45,7 +45,7 @@ namespace musik{ namespace core{ namespace http{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IResponder{
+class  IResponder{
     public:
         virtual void SendContent(const char* buffer,const std::size_t bufferSize)=0;
         virtual bool Exited()=0;

src/core/http/RequestParser.h

@@ -49,7 +49,7 @@ namespace musik{ namespace core{ namespace http{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT RequestParser : public IRequestParser{
+class  RequestParser : public IRequestParser{
     public:
         RequestParser();
         void Parse(const std::string &request);

src/core/http/Responder.h

@@ -51,9 +51,9 @@
 //////////////////////////////////////////////////////////////////////////////
 // Forward declare
 namespace musik{ namespace core{ namespace http{
-    class MUSIK_EXPORT Responder;
-    class MUSIK_EXPORT Server;
-    class MUSIK_EXPORT RequestParser;
+    class  Responder;
+    class  Server;
+    class  RequestParser;
     typedef boost::shared_ptr<Responder> ResponderPtr;
 } } }
 //////////////////////////////////////////////////////////////////////////////
@@ -66,7 +66,7 @@ namespace musik{ namespace core{ namespace http{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT Responder : public IResponder{
+class  Responder : public IResponder{
     public:
         Responder(Server &server,boost::asio::io_service &ioService,utfstring dbFilename);
         virtual ~Responder();

src/core/http/Server.h

@@ -54,7 +54,7 @@
 namespace musik{ namespace core{ namespace http {
 
 //////////////////////////////////////////////////////////////////////////////
-class MUSIK_EXPORT Server : private boost::noncopyable{
+class  Server : private boost::noncopyable{
     public:
         Server(int port);
         ~Server();

src/core/http/TrackSender.h

@@ -48,7 +48,7 @@
 namespace musik{ namespace core{ namespace http {
 
 //////////////////////////////////////////////////////////////////////////////
-class MUSIK_EXPORT TrackSender : public IRequestPlugin{
+class  TrackSender : public IRequestPlugin{
     public:
         TrackSender();
 

src/core/musik_dll_exports.h

@@ -2,22 +2,22 @@
 #ifndef _musik_DLLDEFINES_H_
 #define _musik_DLLDEFINES_H_
 
-/* Cmake will define musik_EXPORTS on Windows when it
+/* Cmake will define S on Windows when it
 configures to build a shared library. If you are going to use
 another build system on windows or create the visual studio
-projects by hand you need to define musik_EXPORTS when
+projects by hand you need to define S when
 building a DLL on windows.
 */
 // We are using the Visual Studio Compiler and building Shared libraries
 
 #if defined (_WIN32) 
-  #if defined(musik_EXPORTS)
-    #define  MUSIK_EXPORT __declspec(dllexport)
+  #if defined(S)
+    #define   __declspec(dllexport)
   #else
-    #define  MUSIK_EXPORT __declspec(dllimport)
-  #endif /* musik_EXPORTS */
+    #define   __declspec(dllimport)
+  #endif /* S */
 #else /* defined (_WIN32) */
- #define MUSIK_EXPORT
+ #define 
 #endif
 
 #endif /* _musik_DLLDEFINES_H_ */

src/core/server/Connection.h

@@ -38,7 +38,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // Forward declare
 namespace musik{ namespace core{
-    class MUSIK_EXPORT Server;
+    class  Server;
 } }
 //////////////////////////////////////////////////////////////////////////////
 

src/core/server/User.h

@@ -48,7 +48,7 @@ namespace musik{ namespace core{ namespace server{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT User
+class  User
 {
     public:
         User(int id,const utfchar *username,const utfchar *password,const utfchar *name);

src/core/server/UserSession.h

@@ -48,7 +48,7 @@ namespace musik{ namespace core{ namespace server{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT UserSession
+class  UserSession
 {
     public:
         UserSession(UserPtr& user,std::string uniqueId,std::string ip);

src/core/tracklist/LibraryList.h

@@ -57,7 +57,7 @@ namespace musik{ namespace core{ namespace tracklist {
 ///\brief
 ///A LibraryList can only contain track from one single library
 //////////////////////////////////////////
-class MUSIK_EXPORT LibraryList : public Base, public sigslot::has_slots<> {
+class  LibraryList : public Base, public sigslot::has_slots<> {
     public:
         LibraryList(musik::core::LibraryPtr library);
 

src/core/tracklist/MultiLibraryList.h

@@ -61,7 +61,7 @@ namespace musik{ namespace core{ namespace tracklist {
 ///\brief
 ///The MultiLibraryList can contain tracks from multiple libraries and GenericTracks
 //////////////////////////////////////////
-class MUSIK_EXPORT MultiLibraryList : public Base, public sigslot::has_slots<> {
+class  MultiLibraryList : public Base, public sigslot::has_slots<> {
     public:
         MultiLibraryList();
 

src/core/xml/IReadSupplier.h

@@ -43,7 +43,7 @@ namespace musik{ namespace core{ namespace xml{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IReadSupplier{
+class  IReadSupplier{
     public:
         virtual bool Read(long recommendedBytes=1024) = 0;
         virtual char* Buffer() = 0;

src/core/xml/IWriteSupplier.h

@@ -43,7 +43,7 @@ namespace musik{ namespace core{ namespace xml{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT IWriteSupplier{
+class  IWriteSupplier{
     public:
         virtual bool Write(const char* buffer,long bytes) = 0;
         virtual void Flush() = 0;

src/core/xml/Node.h

@@ -47,13 +47,13 @@ namespace musik{ namespace core{ namespace xml{
 
 //////////////////////////////////////////////////////////////////////////////
 // Forward declare
-class MUSIK_EXPORT Parser;
-class MUSIK_EXPORT ParserNode;
-class MUSIK_EXPORT Writer;
-class MUSIK_EXPORT WriterNode;
+class  Parser;
+class  ParserNode;
+class  Writer;
+class  WriterNode;
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT Node{
+class  Node{
     public:
         ~Node(void);
     private:

src/core/xml/Parser.h

@@ -52,7 +52,7 @@ typedef struct XML_ParserStruct *XML_Parser;
 
 namespace musik{ namespace core{ namespace xml{
     // Forward
-    class MUSIK_EXPORT ParserNode;
+    class  ParserNode;
 } } }
 //////////////////////////////////////////////////////////////////////////////
 
@@ -86,7 +86,7 @@ namespace musik{ namespace core{ namespace xml{
 ///\see
 ///musik::core::xml::ParserNode
 //////////////////////////////////////////
-class MUSIK_EXPORT Parser : public ParserNode{
+class  Parser : public ParserNode{
     public:
         Parser(IReadSupplier *supplier);
         ~Parser();

src/core/xml/ParserNode.h

@@ -45,7 +45,7 @@
 namespace musik{ namespace core{ namespace xml{
 
 // Forward
-class MUSIK_EXPORT Parser;
+class  Parser;
 
 
 //////////////////////////////////////////
@@ -57,7 +57,7 @@ class MUSIK_EXPORT Parser;
 ///\see
 ///musik::core::xml::Parser
 //////////////////////////////////////////
-class MUSIK_EXPORT ParserNode {
+class  ParserNode {
     public:
 
         ParserNode();

src/core/xml/Socket.h

@@ -46,7 +46,7 @@
 namespace musik{ namespace core{ namespace xml{
 
 //////////////////////////////////////////////////////////////////////////////
-class MUSIK_EXPORT SocketReader : public IReadSupplier{
+class  SocketReader : public IReadSupplier{
     public:
         SocketReader(boost::asio::ip::tcp::socket &socket);
         ~SocketReader(void);
@@ -64,7 +64,7 @@ class MUSIK_EXPORT SocketReader : public IReadSupplier{
 };
 
 //////////////////////////////////////////////////////////////////////////////
-class MUSIK_EXPORT SocketWriter : public IWriteSupplier{
+class  SocketWriter : public IWriteSupplier{
     public:
         SocketWriter(boost::asio::ip::tcp::socket &socket);
         ~SocketWriter(void);

src/core/xml/Writer.h

@@ -49,7 +49,7 @@ namespace musik{ namespace core{ namespace xml{
 
 //////////////////////////////////////////////////////////////////////////////
 
-class MUSIK_EXPORT Writer : public WriterNode{
+class  Writer : public WriterNode{
     public:
         Writer(IWriteSupplier *supplier);
         ~Writer();

src/core/xml/WriterNode.h

@@ -44,10 +44,10 @@
 namespace musik{ namespace core{ namespace xml{
 
 // Forward
-class MUSIK_EXPORT Writer;
+class  Writer;
 
 
-class MUSIK_EXPORT WriterNode {
+class  WriterNode {
     public:
 
         WriterNode(WriterNode &parentNode,std::string name);