fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / contrib / build / mmedia / makefile.wat

diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat
index 8af81823a2e1ddd22c7c68f2317902747d4b0967..d15f4fa804ce7bc0bc619e8cc5e25225d174155b 100644 (file)
--- a/contrib/build/mmedia/makefile.wat
+++ b/contrib/build/mmedia/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -214,8 +214,8 @@ __UNICODE_DEFINE_p = -d_UNICODE
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_RELEASE_NODOT = 27
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\src\mmedia\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -224,7 +224,7 @@ SETUPHDIR = &
 MMEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include &
        -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\mmedia\..\..\include &
        -dWXUSINGDLL -dWXMAKINGDLL_MMEDIA /fh=$(OBJS)\wxprec_mmediadll.pch &
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
@@ -253,7 +253,7 @@ MMEDIADLL_OBJECTS =  &
 MMEDIALIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include &
        -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\mmedia\..\..\include &
        /fh=$(OBJS)\wxprec_mmedialib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
        $(CPPFLAGS) $(CXXFLAGS)
@@ -322,131 +322,131 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 $(OBJS)\mmediadll_dummy.obj :  .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_version.res :  .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\version.rc
-       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=..\..\src\mmedia\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) $<
+       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=..\..\src\mmedia\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_wat$(VENDORTAG) $<
 
 $(OBJS)\mmediadll_cdwin.obj :  .AUTODEPEND ../../src/mmedia\cdwin.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndwin.obj :  .AUTODEPEND ../../src/mmedia\sndwin.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_vidwin.obj :  .AUTODEPEND ../../src/mmedia\vidwin.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_cdbase.obj :  .AUTODEPEND ../../src/mmedia\cdbase.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_g711.obj :  .AUTODEPEND ../../src/mmedia\g711.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_g721.obj :  .AUTODEPEND ../../src/mmedia\g721.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_g723_24.obj :  .AUTODEPEND ../../src/mmedia\g723_24.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_g723_40.obj :  .AUTODEPEND ../../src/mmedia\g723_40.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_g72x.obj :  .AUTODEPEND ../../src/mmedia\g72x.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndaiff.obj :  .AUTODEPEND ../../src/mmedia\sndaiff.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndbase.obj :  .AUTODEPEND ../../src/mmedia\sndbase.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndcodec.obj :  .AUTODEPEND ../../src/mmedia\sndcodec.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndcpcm.obj :  .AUTODEPEND ../../src/mmedia\sndcpcm.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndfile.obj :  .AUTODEPEND ../../src/mmedia\sndfile.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndg72x.obj :  .AUTODEPEND ../../src/mmedia\sndg72x.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndmsad.obj :  .AUTODEPEND ../../src/mmedia\sndmsad.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndpcm.obj :  .AUTODEPEND ../../src/mmedia\sndpcm.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndulaw.obj :  .AUTODEPEND ../../src/mmedia\sndulaw.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_sndwav.obj :  .AUTODEPEND ../../src/mmedia\sndwav.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmediadll_vidbase.obj :  .AUTODEPEND ../../src/mmedia\vidbase.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_dummy.obj :  .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_cdwin.obj :  .AUTODEPEND ../../src/mmedia\cdwin.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndwin.obj :  .AUTODEPEND ../../src/mmedia\sndwin.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_vidwin.obj :  .AUTODEPEND ../../src/mmedia\vidwin.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_cdbase.obj :  .AUTODEPEND ../../src/mmedia\cdbase.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_g711.obj :  .AUTODEPEND ../../src/mmedia\g711.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_g721.obj :  .AUTODEPEND ../../src/mmedia\g721.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_g723_24.obj :  .AUTODEPEND ../../src/mmedia\g723_24.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_g723_40.obj :  .AUTODEPEND ../../src/mmedia\g723_40.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_g72x.obj :  .AUTODEPEND ../../src/mmedia\g72x.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndaiff.obj :  .AUTODEPEND ../../src/mmedia\sndaiff.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndbase.obj :  .AUTODEPEND ../../src/mmedia\sndbase.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndcodec.obj :  .AUTODEPEND ../../src/mmedia\sndcodec.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndcpcm.obj :  .AUTODEPEND ../../src/mmedia\sndcpcm.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndfile.obj :  .AUTODEPEND ../../src/mmedia\sndfile.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndg72x.obj :  .AUTODEPEND ../../src/mmedia\sndg72x.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndmsad.obj :  .AUTODEPEND ../../src/mmedia\sndmsad.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndpcm.obj :  .AUTODEPEND ../../src/mmedia\sndpcm.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndulaw.obj :  .AUTODEPEND ../../src/mmedia\sndulaw.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_sndwav.obj :  .AUTODEPEND ../../src/mmedia\sndwav.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
 
 $(OBJS)\mmedialib_vidbase.obj :  .AUTODEPEND ../../src/mmedia\vidbase.cpp
-       $(CXX) -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<