Unicode compilation fix

[wxWidgets.git] / tests / makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index af0d5ce7728b44f21cc3311bf3048d48502f2519..625811c251d654076fad8ebd1e40240b8783a922 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -210,7 +210,7 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 27
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -219,7 +219,7 @@ SETUPHDIR = &
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__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=.\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -wx -wcd=549 -wcd=656 &
        -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &
        /fh=$(OBJS)\testprec_test.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
        $(CXXFLAGS)
@@ -242,8 +242,10 @@ TEST_OBJECTS =  &
        $(OBJS)\test_mbconvtest.obj &
        $(OBJS)\test_regextest.obj &
        $(OBJS)\test_wxregextest.obj &
+       $(OBJS)\test_scopeguardtest.obj &
        $(OBJS)\test_strings.obj &
        $(OBJS)\test_stdstrings.obj &
+       $(OBJS)\test_tokenizer.obj &
        $(OBJS)\test_unicode.obj &
        $(OBJS)\test_crt.obj &
        $(OBJS)\test_bstream.obj &
@@ -260,7 +262,7 @@ TEST_OBJECTS =  &
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__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=.\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -wx -wcd=549 -wcd=656 &
        -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH &
        $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test_gui.pch $(__RTTIFLAG) &
        $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
@@ -318,119 +320,125 @@ data : .SYMBOLIC
        for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\test_dummy.obj :  .AUTODEPEND .\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_archivetest.obj :  .AUTODEPEND .\archive\archivetest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_ziptest.obj :  .AUTODEPEND .\archive\ziptest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_arrays.obj :  .AUTODEPEND .\arrays\arrays.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_fileconftest.obj :  .AUTODEPEND .\fileconf\fileconftest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_filekind.obj :  .AUTODEPEND .\filekind\filekind.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_filenametest.obj :  .AUTODEPEND .\filename\filenametest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_filesystest.obj :  .AUTODEPEND .\filesys\filesystest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_fontmaptest.obj :  .AUTODEPEND .\fontmap\fontmaptest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_formatconvertertest.obj :  .AUTODEPEND .\formatconverter\formatconvertertest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_hashes.obj :  .AUTODEPEND .\hashes\hashes.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_lists.obj :  .AUTODEPEND .\lists\lists.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_longlongtest.obj :  .AUTODEPEND .\longlong\longlongtest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_mbconvtest.obj :  .AUTODEPEND .\mbconv\mbconvtest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_regextest.obj :  .AUTODEPEND .\regex\regextest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_wxregextest.obj :  .AUTODEPEND .\regex\wxregextest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_scopeguardtest.obj :  .AUTODEPEND .\scopeguard\scopeguardtest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_strings.obj :  .AUTODEPEND .\strings\strings.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_stdstrings.obj :  .AUTODEPEND .\strings\stdstrings.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_tokenizer.obj :  .AUTODEPEND .\strings\tokenizer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_unicode.obj :  .AUTODEPEND .\strings\unicode.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_crt.obj :  .AUTODEPEND .\strings\crt.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_bstream.obj :  .AUTODEPEND .\streams\bstream.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_datastreamtest.obj :  .AUTODEPEND .\streams\datastreamtest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_ffilestream.obj :  .AUTODEPEND .\streams\ffilestream.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_filestream.obj :  .AUTODEPEND .\streams\filestream.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_largefile.obj :  .AUTODEPEND .\streams\largefile.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_sstream.obj :  .AUTODEPEND .\streams\sstream.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_tempfile.obj :  .AUTODEPEND .\streams\tempfile.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_textstreamtest.obj :  .AUTODEPEND .\streams\textstreamtest.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.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=.\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\samples $<
+       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=.\..\include -i=. $(__DLLFLAG_p) -i=.\..\samples $<
 
 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
 $(OBJS)\test_gui_test.obj :  .AUTODEPEND .\test.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
 $(OBJS)\test_gui_rect.obj :  .AUTODEPEND .\geometry\rect.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
 $(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
 $(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp
-       $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<