Make wxMMedia2 compile on VC++ 5

Added makefile for VC++ 5
Warning: sndwin.cpp will not compile, it is unfinished

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

diff --git a/utils/wxMMedia2/lib/cdbase.h b/utils/wxMMedia2/lib/cdbase.h
index 8069d0a2e488df4a098f2a9abd5ac5a132e7d3de..a46821b38c52f11655236899c56a83332e523b6b 100644 (file)
--- a/utils/wxMMedia2/lib/cdbase.h
+++ b/utils/wxMMedia2/lib/cdbase.h
@@ -15,11 +15,7 @@
 #pragma interface
 #endif
 
-#ifdef WX_PRECOMP
-#include "wx_prec.h"
-#else
-#include "wx/wx.h"
-#endif
+#include "wx/wxprec.h"
 
 typedef struct wxCDtime {
   wxUint8 track;

diff --git a/utils/wxMMedia2/lib/cdwin.cpp b/utils/wxMMedia2/lib/cdwin.cpp
index 12439116a83b8ab3890e660fbd009d4bb426fc73..8ac8c3a243ff804e20a6f26fc5a78c3dfe65db12 100644 (file)
--- a/utils/wxMMedia2/lib/cdwin.cpp
+++ b/utils/wxMMedia2/lib/cdwin.cpp
@@ -14,11 +14,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <mmsystem.h>
-#ifdef WX_PRECOMP
 #include "wx/wxprec.h"
-#else
-#include "wx/wx.h"
-#endif
 #define WXMMEDIA_INTERNAL
 #include "cdbase.h"
 #include "cdwin.h"
@@ -69,7 +65,6 @@ wxCDAudioWin::~wxCDAudioWin(void)
 void wxCDAudioWin::PrepareToc(void)
 {
   MCI_STATUS_PARMS status_struct;
-  MCI_SET_PARMS set_struct;
   wxUint16 i, nb_m_trksize;
   wxCDtime total_time, *trk;
   DWORD ret, tmem;
@@ -201,7 +196,7 @@ wxCDtime wxCDAudioWin::GetTime(void)
   return cd_time;
 }
 
-wxCDAudio::CDtoc& wxCDAudioWin::GetToc(void)
+const wxCDAudio::CDtoc& wxCDAudioWin::GetToc(void)
 {
   return *m_toc;
 }

diff --git a/utils/wxMMedia2/lib/cdwin.h b/utils/wxMMedia2/lib/cdwin.h
index f367aeb68764a9c33b5f1bd8ac9568c19daaffac..0c8fa5fd95fbd8e55cd9195dd2d635778c1e01df 100644 (file)
--- a/utils/wxMMedia2/lib/cdwin.h
+++ b/utils/wxMMedia2/lib/cdwin.h
@@ -14,11 +14,7 @@
 #pragma interface
 #endif
 
-#ifdef WX_PRECOMP
 #include "wx/wxprec.h"
-#else
-#include "wx/wx.h"
-#endif
 #include "cdbase.h"
 
 #ifdef WXMMEDIA_INTERNAL
@@ -56,7 +52,7 @@ public:
   ///
   virtual wxCDtime GetTime(void);
   ///
-  virtual CDtoc& GetToc(void);
+  virtual const CDtoc& GetToc(void);
   ///
   virtual inline bool Ok(void) const { return m_ok; }
 protected:

diff --git a/utils/wxMMedia2/lib/g711.cpp b/utils/wxMMedia2/lib/g711.cpp
index d4d60a5c265079a97cfc9ddd4ca5e4879295e64b..99fb3cafc0b90e75788ebce396f201e5046bcaaf 100644 (file)
--- a/utils/wxMMedia2/lib/g711.cpp
+++ b/utils/wxMMedia2/lib/g711.cpp
@@ -24,6 +24,8 @@
  * Mountain View, California  94043
  */
 
+#include <wx/wxprec.h>
+
 /*
  * g711.c
  *

diff --git a/utils/wxMMedia2/lib/g721.cpp b/utils/wxMMedia2/lib/g721.cpp
index 3411d1a1bbc3fd654bfd15d76b77433d427eb030..309d03906834a4871e6a9c5b035510ce54461b81 100644 (file)
--- a/utils/wxMMedia2/lib/g721.cpp
+++ b/utils/wxMMedia2/lib/g721.cpp
@@ -24,6 +24,8 @@
  * Mountain View, California  94043
  */
 
+#include <wx/wxprec.h>
+
 /*
  * g721.c
  *

diff --git a/utils/wxMMedia2/lib/g723_24.cpp b/utils/wxMMedia2/lib/g723_24.cpp
index ba122eadf35126564bc348104f0b443aec7b47dd..3193ad427edbd66e7156bff2abd89d047760e813 100644 (file)
--- a/utils/wxMMedia2/lib/g723_24.cpp
+++ b/utils/wxMMedia2/lib/g723_24.cpp
@@ -37,6 +37,7 @@
  * of workstation attributes, such as hardware 2's complement arithmetic.
  *
  */
+#include <wx/wxprec.h>
 #include "g72x.h"
 
 /*

diff --git a/utils/wxMMedia2/lib/g723_40.cpp b/utils/wxMMedia2/lib/g723_40.cpp
index b8ec06a6862025be4bcac88f9945caaf0703a1ea..141fe7b67d9f224ef3fd879556d72af9101ed1ea 100644 (file)
--- a/utils/wxMMedia2/lib/g723_40.cpp
+++ b/utils/wxMMedia2/lib/g723_40.cpp
@@ -45,6 +45,7 @@
  * the name of the module which it is implementing.
  *
  */
+#include <wx/wxprec.h>
 #include "g72x.h"
 
 /*

diff --git a/utils/wxMMedia2/lib/makefile.vc b/utils/wxMMedia2/lib/makefile.vc
new file mode 100644 (file)
index 0000000..12736d6
--- /dev/null
+++ b/utils/wxMMedia2/lib/makefile.vc
@@ -0,0 +1,106 @@
+#
+# File:                makefile.nt
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:   (c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds GLCanvas class library (MS VC++).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+MMDIR = $(WXDIR)\utils\wxMMedia2
+THISDIR = $(MMDIR)\lib
+EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
+
+LIBTARGET=$(WXDIR)\lib\mmedia2.lib
+OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj \
+        g723_40.obj g72x.obj sndbase.obj sndcodec.obj sndpcm.obj \
+        sndcpcm.obj sndulaw.obj sndfile.obj sndwav.obj sndaiff.obj sndwin.obj \
+        vidbase.obj
+
+!include $(WXDIR)\src\makelib.vc
+
+cdbase.obj:      cdbase.h cdbase.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+cdwin.obj:      cdwin.h cdwin.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+g711.obj:      g72x.h g711.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+g721.obj:      g72x.h g721.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+g723_24.obj:      g72x.h g723_24.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+g723_40.obj:      g72x.h g723_40.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndbase.obj:      sndbase.h sndbase.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndcodec.obj:      sndcodec.h sndcodec.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndpcm.obj:      sndpcm.h sndpcm.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndcpcm.obj:      sndcpcm.h converter.def sndcpcm.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndulaw.obj:      sndulaw.h g72x.h sndulaw.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndfile.obj:      sndfile.h sndfile.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndwav.obj:      sndwav.h sndwav.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndaiff.obj:      sndaiff.h sndaiff.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+sndwin.obj:      sndwin.h sndwin.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+vidbase.obj:      vidbase.h vidbase.$(SRCSUFF)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<

diff --git a/utils/wxMMedia2/lib/sndaiff.cpp b/utils/wxMMedia2/lib/sndaiff.cpp
index 8c53872a94471f1f2a894fd3a0ef8bb9a5b038ab..a65f8756e9631dfbc3f5f850c5e4ea1468f61b23 100644 (file)
--- a/utils/wxMMedia2/lib/sndaiff.cpp
+++ b/utils/wxMMedia2/lib/sndaiff.cpp
@@ -9,7 +9,8 @@
 #pragma implementation "sndaiff.cpp"
 #endif
 
-#include <wx/defs.h>
+#include <wx/wxprec.h>
+
 #include <wx/stream.h>
 #include <wx/datstrm.h>
 #include <wx/filefn.h>

diff --git a/utils/wxMMedia2/lib/sndbase.cpp b/utils/wxMMedia2/lib/sndbase.cpp
index 2cfc5c0a31c8407f36e14639f19701f5602e11b8..d5e6e8f72a224516eebbdf55717488794f7ab5b0 100644 (file)
--- a/utils/wxMMedia2/lib/sndbase.cpp
+++ b/utils/wxMMedia2/lib/sndbase.cpp
@@ -9,6 +9,7 @@
 #pragma implementation "sndbase.cpp"
 #endif
 
+#include <wx/wxprec.h>
 #include "sndbase.h"
 
 

diff --git a/utils/wxMMedia2/lib/sndcodec.cpp b/utils/wxMMedia2/lib/sndcodec.cpp
index 270a2c184e809911f156a599658f3247956319de..a21281b7b528418a83872975b4bb3774d7dfd779 100644 (file)
--- a/utils/wxMMedia2/lib/sndcodec.cpp
+++ b/utils/wxMMedia2/lib/sndcodec.cpp
@@ -9,6 +9,7 @@
 #pragma implementation "sndcodec.cpp"
 #endif
 
+#include <wx/wxprec.h>
 #include "sndbase.h"
 #include "sndcodec.h"
 

diff --git a/utils/wxMMedia2/lib/sndcpcm.cpp b/utils/wxMMedia2/lib/sndcpcm.cpp
index 5b3fc9b26e953382cac05bfc09c91ac98ce82f29..8f54607ec152a5828c047a169d5ece98eb68dc23 100644 (file)
--- a/utils/wxMMedia2/lib/sndcpcm.cpp
+++ b/utils/wxMMedia2/lib/sndcpcm.cpp
@@ -9,6 +9,7 @@
 #pragma implementation "sndcpcm.cpp"
 #endif
 
+#include <wx/wxprec.h>
 #include "sndbase.h"
 #include "sndpcm.h"
 #include "sndcpcm.h"

diff --git a/utils/wxMMedia2/lib/sndfile.cpp b/utils/wxMMedia2/lib/sndfile.cpp
index 3040943411dc4c600729b09bc4e45b2b4cffc131..6525d2bbc6a8b77357e89a22ec4cbbe9bf2f577d 100644 (file)
--- a/utils/wxMMedia2/lib/sndfile.cpp
+++ b/utils/wxMMedia2/lib/sndfile.cpp
@@ -5,7 +5,12 @@
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
 // --------------------------------------------------------------------------
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
 #include <wx/stream.h>
+#endif
+
 #include "sndbase.h"
 #include "sndcodec.h"
 #include "sndfile.h"
@@ -258,8 +263,9 @@ bool wxSoundFileStream::StopProduction()
 void wxSoundFileStream::OnSoundEvent(int evt)
 {
   size_t len = m_sndio->GetBestSize();
-  char buffer[m_sndio->GetBestSize()];
+  char *buffer;
 
+  buffer = new char[m_sndio->GetBestSize()];
   wxSoundStream::OnSoundEvent(evt);
 
   switch(evt) {
@@ -284,6 +290,7 @@ void wxSoundFileStream::OnSoundEvent(int evt)
     m_codec.Write(buffer, len);
     break;
   }
+  delete[] buffer;
 }
 
 bool wxSoundFileStream::SetSoundFormat(const wxSoundFormatBase& format)

diff --git a/utils/wxMMedia2/lib/sndpcm.cpp b/utils/wxMMedia2/lib/sndpcm.cpp
index 50a24361ed297d51eab7c7749e64d343d063f88a..8e3225c1f7d9e0c714bdf832d337f8a16fcfc337 100644 (file)
--- a/utils/wxMMedia2/lib/sndpcm.cpp
+++ b/utils/wxMMedia2/lib/sndpcm.cpp
@@ -9,10 +9,10 @@
 #pragma implementation "sndpcm.cpp"
 #endif
 
+#include <wx/wxprec.h>
 #include "sndbase.h"
 #include "sndpcm.h"
 
-
 wxSoundFormatPcm::wxSoundFormatPcm(wxUint32 srate, wxUint8 bps, 
                                    wxUint16 nchannels, bool sign,
                                    int order) 

diff --git a/utils/wxMMedia2/lib/sndulaw.cpp b/utils/wxMMedia2/lib/sndulaw.cpp
index bba1cd7eea959ba2a22a7e51e4d386eea1ec700a..3142d173c5296a9a6342caa2fc2de038dcc01f26 100644 (file)
--- a/utils/wxMMedia2/lib/sndulaw.cpp
+++ b/utils/wxMMedia2/lib/sndulaw.cpp
@@ -9,6 +9,7 @@
 #pragma implementation "sndulaw.cpp"
 #endif
 
+#include <wx/wxprec.h>
 #include "sndbase.h"
 #include "sndfile.h"
 #include "sndpcm.h"

diff --git a/utils/wxMMedia2/lib/sndwav.cpp b/utils/wxMMedia2/lib/sndwav.cpp
index 9cd9fb2f84e1d159f0984737a059dcdbfaae31bf..f0d3f66a29d2e1b5a6cb25c627a4322eb6fd89f9 100644 (file)
--- a/utils/wxMMedia2/lib/sndwav.cpp
+++ b/utils/wxMMedia2/lib/sndwav.cpp
@@ -9,10 +9,12 @@
 #pragma implementation "sndwav.cpp"
 #endif
 
-#include <wx/defs.h>
+#include <wx/wxprec.h>
+
 #include <wx/stream.h>
 #include <wx/datstrm.h>
 #include <wx/filefn.h>
+
 #include "sndbase.h"
 #include "sndcodec.h"
 #include "sndfile.h"

diff --git a/utils/wxMMedia2/lib/vidbase.cpp b/utils/wxMMedia2/lib/vidbase.cpp
index 98084b54d601ac0af0588169131c260c97033d95..629389b52c74c81ea985be126cd0224f2e0fb0da 100644 (file)
--- a/utils/wxMMedia2/lib/vidbase.cpp
+++ b/utils/wxMMedia2/lib/vidbase.cpp
@@ -10,14 +10,16 @@
 #ifdef __GNUG__
 #pragma implementation "vidbase.h"
 #endif
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/stream.h>
 #include <wx/wfstream.h>
-#include "vidbase.h"
-#ifdef WX_PRECOMP
-#include "wx_prec.h"
-#else
-#include "wx/wx.h"
 #endif
 
+#include "vidbase.h"
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif