ported rest of contrib to bakefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/include/wx/mmedia/cdbase.h

@@ -16,18 +16,19 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
+#include "wx/mmedia/defs.h"
 
 typedef struct wxCDtime {
   wxUint8 track;
   wxUint8 hour, min, sec;
 } wxCDtime;
 
-class WXDLLEXPORT wxCDAudio : public wxObject {
+class WXDLLIMPEXP_MMEDIA wxCDAudio : public wxObject {
   DECLARE_ABSTRACT_CLASS(wxCDAudio)
 public:
   typedef enum { PLAYING, PAUSED, STOPPED } CDstatus;
   // Table of contents manager
-  class WXDLLEXPORT CDtoc {
+  class WXDLLIMPEXP_MMEDIA CDtoc {
   protected:
     wxCDtime *tracks_time, *tracks_pos;
     wxCDtime total_time;

contrib/include/wx/mmedia/cdunix.h

@@ -17,10 +17,11 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/cdbase.h"
 
 ///
-class WXDLLEXPORT wxCDAudioLinux : public wxCDAudio {
+class WXDLLIMPEXP_MMEDIA wxCDAudioLinux : public wxCDAudio {
   DECLARE_DYNAMIC_CLASS(wxCDAudioLinux)
 protected:
   wxCDtime m_time;

contrib/include/wx/mmedia/cdwin.h

@@ -15,6 +15,7 @@
 #endif
 
 #include "wx/wxprec.h"
+#include "wx/mmedia/defs.h"
 #include "cdbase.h"
 
 #ifdef WXMMEDIA_INTERNAL
@@ -26,7 +27,7 @@ typedef struct CDAW_Internal {
 #endif
 
 ///
-class WXDLLEXPORT wxCDAudioWin : public wxCDAudio {
+class WXDLLIMPEXP_MMEDIA wxCDAudioWin : public wxCDAudio {
   DECLARE_DYNAMIC_CLASS(wxCDAudioWin)
 protected:
   struct CDAW_Internal *m_internal;

contrib/include/wx/mmedia/defs.h

@@ -0,0 +1,15 @@
+#ifndef _WX_MMEDIA_DEFS_H_
+#define _WX_MMEDIA_DEFS_H_
+
+#ifdef WXMAKINGDLL_MMEDIA
+    #define WXDLLIMPEXP_MMEDIA WXEXPORT
+    #define WXDLLIMPEXP_DATA_MMEDIA(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_MMEDIA WXIMPORT
+    #define WXDLLIMPEXP_DATA_MMEDIA(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_MMEDIA
+    #define WXDLLIMPEXP_DATA_MMEDIA(type) type
+#endif
+
+#endif // _WX_MMEDIA_DEFS_H_

contrib/include/wx/mmedia/sndaiff.h

@@ -14,6 +14,7 @@
 
 #include "wx/defs.h"
 #include "wx/stream.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndcodec.h"
 #include "wx/mmedia/sndfile.h"
@@ -22,7 +23,7 @@
 // AIFF codec
 //
 
-class WXDLLEXPORT wxSoundAiff: public wxSoundFileStream {
+class WXDLLIMPEXP_MMEDIA wxSoundAiff: public wxSoundFileStream {
 public:
     wxSoundAiff(wxInputStream& stream, wxSoundStream& io_sound);
     wxSoundAiff(wxOutputStream& stream, wxSoundStream& io_sound);

contrib/include/wx/mmedia/sndbase.h

@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/mmedia/defs.h"
 
 // ------------------------------------------------------------------------
 // DEFINITIONS
@@ -76,7 +77,7 @@ typedef enum {
   wxSOUND_NOTSTARTED
 } wxSoundError;
 
-class WXDLLEXPORT wxSoundStream;
+class WXDLLIMPEXP_MMEDIA wxSoundStream;
 
 // ---------------------
 // wxSoundCallback(stream, evt, cdata): C callback for sound event.
@@ -92,7 +93,7 @@ typedef void (*wxSoundCallback)(wxSoundStream *stream, int evt,
 // Base class for sound format specification
 //
 
-class WXDLLEXPORT wxSoundFormatBase {
+class WXDLLIMPEXP_MMEDIA wxSoundFormatBase {
  public:
   wxSoundFormatBase();
   virtual ~wxSoundFormatBase();
@@ -112,7 +113,7 @@ class WXDLLEXPORT wxSoundFormatBase {
 // Base class for sound streams
 //
 
-class WXDLLEXPORT wxSoundStream {
+class WXDLLIMPEXP_MMEDIA wxSoundStream {
  public:
   wxSoundStream();
   virtual ~wxSoundStream();

contrib/include/wx/mmedia/sndcodec.h

@@ -13,9 +13,10 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 
-class WXDLLEXPORT wxSoundStreamCodec: public wxSoundStream {
+class WXDLLIMPEXP_MMEDIA wxSoundStreamCodec: public wxSoundStream {
  public:
   wxSoundStreamCodec(wxSoundStream& snd_io);
   ~wxSoundStreamCodec();

contrib/include/wx/mmedia/sndcpcm.h

@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndcodec.h"
 
@@ -20,7 +21,7 @@
 // PCM converter class
 //
 
-class WXDLLEXPORT wxSoundStreamPcm: public wxSoundStreamCodec {
+class WXDLLIMPEXP_MMEDIA wxSoundStreamPcm: public wxSoundStreamCodec {
 public:
     typedef void (*ConverterType)(const void *buf_in, void *buf_out,
                                   wxUint32 len);

contrib/include/wx/mmedia/sndesd.h

@@ -14,6 +14,7 @@
 
 #include "wx/defs.h"
 #include "wx/string.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndpcm.h"
 

contrib/include/wx/mmedia/sndfile.h

@@ -10,6 +10,7 @@
 
 #include "wx/defs.h"
 #include "wx/stream.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndcodec.h"
 
@@ -19,7 +20,7 @@
 // Codec router class
 //
 
-class WXDLLEXPORT wxSoundRouterStream: public wxSoundStreamCodec {
+class WXDLLIMPEXP_MMEDIA wxSoundRouterStream: public wxSoundStreamCodec {
  public:
   wxSoundRouterStream(wxSoundStream& sndio);
   ~wxSoundRouterStream();

contrib/include/wx/mmedia/sndg72x.h

@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndcodec.h"
 #include "wx/mmedia/sndbase.h"
@@ -29,7 +30,7 @@ typedef struct g72x_state g72state;
 //
 // G72X format
 //
-class WXDLLEXPORT wxSoundFormatG72X: public wxSoundFormatBase {
+class WXDLLIMPEXP_MMEDIA wxSoundFormatG72X: public wxSoundFormatBase {
  public:
   wxSoundFormatG72X();
   ~wxSoundFormatG72X();
@@ -57,8 +58,8 @@ class WXDLLEXPORT wxSoundFormatG72X: public wxSoundFormatBase {
 // ULAW converter class
 //
 
-class WXDLLEXPORT wxSoundRouterStream;
-class WXDLLEXPORT wxSoundStreamG72X: public wxSoundStreamCodec {
+class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
+class WXDLLIMPEXP_MMEDIA wxSoundStreamG72X: public wxSoundStreamCodec {
  public:
   wxSoundStreamG72X(wxSoundStream& sndio);
   ~wxSoundStreamG72X();

contrib/include/wx/mmedia/sndmsad.h

@@ -14,6 +14,7 @@
 
 #include "wx/defs.h"
 #include "wx/dynarray.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndcodec.h"
 #include "wx/mmedia/sndbase.h"
 
@@ -22,7 +23,7 @@ WX_DEFINE_EXPORTED_ARRAY_INT(wxInt16, wxMSAdpcmCoeffs);
 //
 // MSADPCM format
 //
-class WXDLLEXPORT wxSoundFormatMSAdpcm: public wxSoundFormatBase {
+class WXDLLIMPEXP_MMEDIA wxSoundFormatMSAdpcm: public wxSoundFormatBase {
 public:
     wxSoundFormatMSAdpcm();
     ~wxSoundFormatMSAdpcm();
@@ -58,8 +59,8 @@ protected:
 //
 // MS ADPCM converter class
 //
-class WXDLLEXPORT wxSoundRouterStream;
-class WXDLLEXPORT wxSoundStreamMSAdpcm: public wxSoundStreamCodec {
+class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
+class WXDLLIMPEXP_MMEDIA wxSoundStreamMSAdpcm: public wxSoundStreamCodec {
 public:
     wxSoundStreamMSAdpcm(wxSoundStream& sndio);
     ~wxSoundStreamMSAdpcm();

contrib/include/wx/mmedia/sndoss.h

@@ -14,6 +14,7 @@
 
 #include "wx/defs.h"
 #include "wx/string.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndpcm.h"
 
@@ -21,7 +22,7 @@
 // OSS output class
 //
 
-class WXDLLEXPORT wxSoundStreamOSS : public wxSoundStream {
+class WXDLLIMPEXP_MMEDIA wxSoundStreamOSS : public wxSoundStream {
  public:
   wxSoundStreamOSS(const wxString& dev_name = wxT("/dev/dsp"));
   ~wxSoundStreamOSS();

contrib/include/wx/mmedia/sndpcm.h

@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 
 //

contrib/include/wx/mmedia/sndulaw.h

@@ -13,13 +13,14 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndcodec.h"
 #include "wx/mmedia/sndbase.h"
 
 //
 // ULAW format
 //
-class WXDLLEXPORT wxSoundFormatUlaw: public wxSoundFormatBase {
+class WXDLLIMPEXP_MMEDIA wxSoundFormatUlaw: public wxSoundFormatBase {
 public:
     wxSoundFormatUlaw();
     ~wxSoundFormatUlaw();
@@ -47,8 +48,8 @@ protected:
 // ULAW converter class
 //
 
-class WXDLLEXPORT wxSoundRouterStream;
-class WXDLLEXPORT wxSoundStreamUlaw: public wxSoundStreamCodec {
+class WXDLLIMPEXP_MMEDIA wxSoundRouterStream;
+class WXDLLIMPEXP_MMEDIA wxSoundStreamUlaw: public wxSoundStreamCodec {
 public:
     wxSoundStreamUlaw(wxSoundStream& sndio);
     ~wxSoundStreamUlaw();

contrib/include/wx/mmedia/sndwav.h

@@ -16,6 +16,7 @@
 #include "wx/string.h"
 #include "wx/stream.h"
 #include "wx/datstrm.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 #include "wx/mmedia/sndcodec.h"
 #include "wx/mmedia/sndfile.h"

contrib/include/wx/mmedia/sndwin.h

@@ -9,13 +9,14 @@
 #define _WX_SNDWIN_H
 
 #include "wx/defs.h"
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/sndbase.h"
 
 typedef struct _wxSoundInternal wxSoundInternal;
 typedef struct _wxSoundInfoHeader wxSoundInfoHeader;
 
-// class WXDLLEXPORT wxSoundInternal;
-class WXDLLEXPORT wxSoundStreamWin : public wxSoundStream {
+// class WXDLLIMPEXP_MMEDIA wxSoundInternal;
+class WXDLLIMPEXP_MMEDIA wxSoundStreamWin : public wxSoundStream {
  public:
   wxSoundStreamWin();
   ~wxSoundStreamWin();

contrib/include/wx/mmedia/vidbase.h

@@ -36,6 +36,8 @@
     #include "wx/frame.h"
 #endif
 
+#include "wx/mmedia/defs.h"
+
 // ----------------------------------------------------------------------------
 // wxMMedia2 (video) types
 
@@ -54,7 +56,7 @@ typedef enum {
 // ----------------------------------------------------------------------------
 // Classes definition
 
-class WXDLLEXPORT wxVideoBaseDriver : public wxObject {
+class WXDLLIMPEXP_MMEDIA wxVideoBaseDriver : public wxObject {
     DECLARE_ABSTRACT_CLASS(wxVideoBaseDriver)
 protected:
     wxWindow *m_video_output;
@@ -104,7 +106,7 @@ public:
     virtual bool IsStopped() const = 0;
 };
 
-WXDLLEXPORT wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv);
+WXDLLIMPEXP_MMEDIA wxFrame *wxVideoCreateFrame(wxVideoBaseDriver *vid_drv);
 
 
 #endif

contrib/include/wx/mmedia/vidwin.h

@@ -36,6 +36,7 @@
 // ----------------------------------------------------------------------------
 // wxMMedia2 headers
 
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/vidbase.h"
 
 // ----------------------------------------------------------------------------
@@ -53,7 +54,7 @@ typedef struct VIDW_Internal {
 // ----------------------------------------------------------------------------
 // Class definition
 
-class WXDLLEXPORT wxVideoWindows : public wxVideoBaseDriver {
+class WXDLLIMPEXP_MMEDIA wxVideoWindows : public wxVideoBaseDriver {
     DECLARE_DYNAMIC_CLASS(wxVideoWindows)
 protected:
     struct VIDW_Internal *m_internal;

contrib/include/wx/mmedia/vidxanm.h

@@ -44,6 +44,7 @@
 // ----------------------------------------------------------------------------
 // wxMMedia2 headers
 
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/vidbase.h"
 
 // ----------------------------------------------------------------------------
@@ -65,7 +66,7 @@ typedef struct wxXANIMinternal {
 // ----------------------------------------------------------------------------
 // Class definition
 
-class WXDLLEXPORT wxVideoXANIM : public wxVideoBaseDriver {
+class WXDLLIMPEXP_MMEDIA wxVideoXANIM : public wxVideoBaseDriver {
     DECLARE_DYNAMIC_CLASS(wxVideoXANIM)
  protected:
     // Remember the state of the subprocess