STL compilation fixes.

[wxWidgets.git] / contrib / src / mmedia / Makefile.in

diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in
index 0074d85e2f5dbc581cd388ab5b20e43651b8fc0d..aed8a229d570a8e43e2ffd031db9ed4c2a6336fa 100644 (file)
--- a/contrib/src/mmedia/Makefile.in
+++ b/contrib/src/mmedia/Makefile.in
@@ -4,11 +4,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/mmedia
 
-TARGET_LIBNAME=libmmedia
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_mmedia-@WX_RELEASE@
+
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@
 
-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=mmedia
@@ -18,10 +19,10 @@ HEADERS=cdbase.h cdunix.h cdwin.h sndaiff.h sndbase.h sndcodec.h \
        sndpcm.h sndulaw.h sndwav.h sndwin.h vidbase.h vidwin.h \
        vidxanm.h
 
-OBJECTS=cdbase.o cdwin.o g711.o g721.o g723_24.o \
+OBJECTS=cdbase.o cdunix.o cdwin.o g711.o g721.o g723_24.o \
   g723_40.o g72x.o sndaiff.o sndbase.o sndcodec.o \
-  sndcpcm.o sndfile.o sndg72x.o sndpcm.o sndulaw.o \
-  sndwav.o sndwin.o vidbase.o vidwin.o vidxanm.o sndoss.o sndesd.o
+  sndcpcm.o sndesd.o sndfile.o sndg72x.o sndmsad.o sndoss.o \
+  sndpcm.o sndulaw.o sndwav.o sndwin.o vidbase.o vidwin.o vidxanm.o
 DEPFILES=$(OBJECTS:.o=.d)
 
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include